Changeset 6493 in orxonox.OLD for branches/network/src/story_entities

Timestamp:

Jan 11, 2006, 5:06:43 PM (19 years ago)

Author:

patrick

Message:

network: playable creation fix

File:

• branches/network/src/story_entities/multi_player_world_data.cc (modified) (2 diffs)

branches/network/src/story_entities/multi_player_world_data.cc

@@ -160 +160 @@
         }
       }
-      else if( !strcmp( element->Value(), "SpaceShip"))       /// FIXME it is not said to be a SpaceShip
-      {
-        BaseObject* created = NetworkGameManager::getInstance()->createEntity(element);
-        if( created != NULL )
-          PRINTF(1)("Created a %s: %s (%8.u)\n", created->getClassName(), created->getName(), created->getLeafClassID());
-        else
-          PRINTF(1)("MultiPlayerWorld: could not create this entity\n");
-      }
       element = element->NextSiblingElement();
+
 
       glmis->step();
@@ -174 +167 @@
     }
 
-
-    /* create a Player */
-    this->localPlayer = new Player();
-//     Playable* playable;
-//     const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
-//     assert( playableList != NULL);
-//
-//     if (playableList != NULL)
-//     {
-//       playable = dynamic_cast<Playable*>(playableList->front());
-//       this->localPlayer->setControllable(playable);
-//     }
+    if( NetworkManager::getInstance()->isGameServer())
+    {
+      this->localPlayer = new Player();
+      State::setPlayer(this->localPlayer);
+
+      Playable* playable;
+      const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+      assert( playableList != NULL);
+
+      if (playableList != NULL)
+      {
+        playable = dynamic_cast<Playable*>(playableList->front());
+        this->localPlayer->setControllable(playable);
+      }
+    }
+    else
+    {
+      /* create a Player */
+      this->localPlayer = new Player();
+      State::setPlayer(this->localPlayer);
+    }
+
 
     /* init the pnode tree */