Changeset 9869 in orxonox.OLD for trunk/src/story_entities/single_player_world.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/story_entities/single_player_world.cc (modified) (2 diffs)

trunk/src/story_entities/single_player_world.cc

@@ -20 +20 @@
 
 #include "state.h"
-#include "class_list.h"
+#include "debug.h"
 
 #include "util/loading/load_param.h"
-#include "fast_factory.h"
+#include "loading/fast_factory.h"
 #include "util/loading/factory.h"
 
@@ -30 +30 @@
 
 
-
-
-
+#include "class_id_DEPRECATED.h"
 //! This creates a Factory to fabricate a SinglePlayerWorld
-CREATE_FACTORY(SinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);
-
-
+ObjectListDefinitionID(SinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);
+CREATE_FACTORY(SinglePlayerWorld);
 
 SinglePlayerWorld::SinglePlayerWorld(const TiXmlElement* root)
   : GameWorld()
 {
-  this->setClassID(CL_SINGLE_PLAYER_WORLD, "SinglePlayerWorld");
+  this->registerObject(this, SinglePlayerWorld::_objectList);
   this->setName("SinglePlayerWorld uninitialized");