Changeset 9757 in orxonox.OLD for branches/new_class_id/src/story_entities

Timestamp:

Sep 18, 2006, 10:06:19 PM (18 years ago)

Author:

bensch

Message:

new_class_id: hups… this was bad naming… confusing too.

Location:

branches/new_class_id/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• game_world_data.cc (modified) (2 diffs)

branches/new_class_id/src/story_entities/game_world.cc

@@ -63 +63 @@
 #include "script_class.h"
 ObjectListDefinition(GameWorld);
-CREATE_SCRIPTABLE_CLASS(GameWorld, GameWorld::classID(),
+CREATE_SCRIPTABLE_CLASS(GameWorld,
                         addMethod("setPlaymode", Executor1<GameWorld, lua_State*,const std::string&>(&GameWorld::setPlaymode))
                         ->addMethod("setSoundtrack", Executor1<GameWorld, lua_State*, const std::string&>(&GameWorld::setSoundtrack))

branches/new_class_id/src/story_entities/game_world_data.cc

@@ -213 +213 @@
 
       //todo do this more elegant
-      if( element->Value() == "SkyBox" && created->isA(SkyBox::classID()))
+      if( element->Value() == "SkyBox" && created->isA(SkyBox::staticClassID()))
       {
         this->sky = dynamic_cast<WorldEntity*>(created);
         State::setSkyBox(dynamic_cast<SkyBox*>(this->sky));
       }
-      if( element->Value() == "Terrain" && created->isA(Terrain::classID()))
+      if( element->Value() == "Terrain" && created->isA(Terrain::staticClassID()))
       {
         this->terrain = dynamic_cast<Terrain*>(created);
@@ -398 +398 @@
     PRINTF(2)("creating %s\n", element->Value());
     BaseObject* created = Factory::fabricate(element);
-    if (created != NULL && created->isA(GameRules::classID()))
+    if (created != NULL && created->isA(GameRules::staticClassID()))
     {
       this->gameRule = dynamic_cast<GameRules*>(created);