Changeset 6412 in orxonox.OLD

Timestamp:

Jan 6, 2006, 1:28:36 PM (18 years ago)

Author:

bensch

Message:

ParamPowerUp is now also loaded correctly

Location:

branches/network/src

Files:

• lib/network/network_game_manager.cc (modified) (2 diffs)
• lib/network/network_game_manager.h (modified) (1 diff)
• story_entities/game_world.cc (modified) (1 diff)
• story_entities/multi_player_world_data.cc (modified) (2 diffs)
• world_entities/power_ups/param_power_up.cc (modified) (1 diff)

branches/network/src/lib/network/network_game_manager.cc

@@ -237 +237 @@
  * @param classID: The ID of the class of which an entity should be created
  */
-BaseObject* NetworkGameManager::createEntity( TiXmlElement* element)
+BaseObject* NetworkGameManager::createEntity(const TiXmlElement* element)
 {
   if ( this->isServer() )
@@ -252 +252 @@
     if ( !b )
     {
-      PRINTF(1)("Could not fabricate Object with classID %x\n", element->Value() );
+      PRINTF(1)("Could not fabricate Object with className %s\n", element->Value() );
       return NULL;
     }

branches/network/src/lib/network/network_game_manager.h

@@ -75 +75 @@
 
     void createEntity( ClassID classID, int owner = 0 );
-    BaseObject* createEntity( TiXmlElement* element);
+    BaseObject* createEntity(const TiXmlElement* element);
     void removeEntity( int uniqueID );
     void sendYouAre( int uniqueID, int userID );

branches/network/src/story_entities/game_world.cc

@@ -319 +319 @@
     {
       /* the frame-rate is limited to 100 frames per second, all other things are for nothing. */
-      PRINTF(0)("fps = 1000 - frame rate is adjusted\n");
+      //PRINTF(0)("fps = 1000 - frame rate is adjusted\n");
       SDL_Delay(10 - dt);
       this->dt = 10;

branches/network/src/story_entities/multi_player_world_data.cc

@@ -145 +145 @@
         BaseObject* created = NetworkGameManager::getInstance()->createEntity(element);
         if( created != NULL )
-          PRINTF(1)("Created a %s: %s\n", created->getClassName(), created->getName());
+          PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassName(), created->getName(), created->getLeafClassID(), element->Value());
         else
           PRINTF(1)("NetworkWorld: could not create this entity\n");
@@ -158 +158 @@
       }
       /* clients only spawn the SpaceShip */
+      /// FIXME it is not said to be a SpaceShip
       else if( !strcmp( element->Value(), "SpaceShip"))
       {
         BaseObject* created = Factory::fabricate(element);
         if( created != NULL )
-          PRINTF(1)("Created a %s: %s\n", created->getClassName(), created->getName());
+          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");

branches/network/src/world_entities/power_ups/param_power_up.cc

@@ -53 +53 @@
 void ParamPowerUp::init()
 {
+  this->setClassID(CL_PARAM_POWER_UP, "ParamPowerUp");
   this->value = 0;
   this->max_value = 0;