Changeset 10114 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Dec 19, 2006, 11:55:26 PM (18 years ago)

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/story_entities

Files:

• menu/game_menu.cc (modified) (1 diff)
• movie_loader.cc (modified) (1 diff)
• multi_player_world.cc (modified) (1 diff)
• multi_player_world_data.cc (modified) (2 diffs)
• single_player_world.cc (modified) (1 diff)

trunk/src/story_entities/menu/game_menu.cc

@@ -41 +41 @@
 #include "parser/preferences/preferences.h"
 
-#include "class_id_DEPRECATED.h"
+
 //! This creates a Factory to fabricate a GameMenu
-ObjectListDefinitionID(GameMenu, CL_GAME_MENU);
+ObjectListDefinition(GameMenu);
 CREATE_FACTORY(GameMenu);
 

trunk/src/story_entities/movie_loader.cc

@@ -25 +25 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(MovieLoader, CL_MOVIE_LOADER);
+
+ObjectListDefinition(MovieLoader);
 CREATE_FACTORY(MovieLoader);
 

trunk/src/story_entities/multi_player_world.cc

@@ -36 +36 @@
 SHELL_COMMAND(debug, MultiPlayerWorld, debug);
 
-#include "class_id_DEPRECATED.h"
+
 //! This creates a Factory to fabricate a MultiPlayerWorld
-ObjectListDefinitionID(MultiPlayerWorld, CL_MULTI_PLAYER_WORLD);
+ObjectListDefinition(MultiPlayerWorld);
 CREATE_FACTORY(MultiPlayerWorld);
 

trunk/src/story_entities/multi_player_world_data.cc

@@ -149 +149 @@
         BaseObject* created = Factory::fabricate(element);
         if( created != NULL )
-          PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getLeafClassID(), element->Value());
+          PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), (int)created->getClassID().id(), element->Value());
         else
           PRINTF(1)("NetworkWorld: could not create this entity\n");
@@ -180 +180 @@
 
           if( created != NULL )
-            PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getLeafClassID(), element->Value());
+            PRINTF(1)("Created a %s: %s (0x%8x) from %s\n", created->getClassCName(), created->getCName(), created->getClassID().id(), element->Value());
           else
             PRINTF(1)("NetworkWorld: could not create this entity\n");

trunk/src/story_entities/single_player_world.cc

@@ -30 +30 @@
 
 
-#include "class_id_DEPRECATED.h"
+
 //! This creates a Factory to fabricate a SinglePlayerWorld
-ObjectListDefinitionID(SinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);
+ObjectListDefinition(SinglePlayerWorld);
 CREATE_FACTORY(SinglePlayerWorld);