Changeset 8068 in orxonox.OLD for trunk/src/story_entities/multi_player_world_data.cc

Timestamp:

Jun 1, 2006, 2:28:16 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk

File:

• trunk/src/story_entities/multi_player_world_data.cc (modified) (6 diffs)

trunk/src/story_entities/multi_player_world_data.cc

@@ -45 +45 @@
 #include "network_manager.h"
 #include "network_game_manager.h"
+#include "player_stats.h"
 
 
@@ -146 +147 @@
       {
         /* pass the entity to the NetworkGameManager to be created */
-        BaseObject* created = NetworkGameManager::getInstance()->createEntity(element);
+        BaseObject* created = Factory::fabricate(element);
         if( created != NULL )
           PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassName(), created->getName(), created->getLeafClassID(), element->Value());
@@ -203 +204 @@
       this->localPlayer = new Player();
 
+#if 0
       Playable* playable;
       const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
@@ -215 +217 @@
         playable->setPlayDirection(Quaternion(M_PI, Vector(0.0, 1.0, 0.0)));
       }
+#endif
     }
     else
@@ -244 +247 @@
   
   State::setPlayer(this->localPlayer);
+ 
 }
 
@@ -265 +269 @@
   /* call underlying function */
   GameWorldData::loadScene(root);
+  
+  // create server playable
+  if ( NetworkManager::getInstance()->isGameServer() )
+  {
+    NetworkGameManager::getInstance()->signalNewPlayer( 0 );
+    State::getPlayer()->setPlayable( PlayerStats::getStats( 0 )->getPlayable() );
+  }
 }