Changeset 6466 in orxonox.OLD

Timestamp:

Jan 11, 2006, 11:09:48 AM (18 years ago)

Author:

patrick

Message:

network: the spaceship spawning bug has been fixed, but no there is no playable connected to the player anymore

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 @@
         }
       }
-      /* clients only spawn the SpaceShip */
-      /// FIXME it is not said to be a SpaceShip
-      else if( !strcmp( element->Value(), "SpaceShip"))
+      else if( !strcmp( element->Value(), "SpaceShip"))       /// FIXME it is not said to be a SpaceShip
       {
-        BaseObject* created = Factory::fabricate(element);
+        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)("NetworkWorld: could not create this entity\n");
+          PRINTF(1)("MultiPlayerWorld: could not create this entity\n");
       }
       element = element->NextSiblingElement();
@@ -179 +177 @@
     /* 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);
-    }
+//     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);
+//     }
 
     /* init the pnode tree */