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

Timestamp:

Sep 1, 2006, 8:06:39 PM (18 years ago)

Author:

bensch

Message:

renamed newclassid to classid and newobjectlist to objectlist

Location:

branches/new_class_id/src/story_entities

Files:

• campaign.cc (modified) (1 diff)
• campaign.h (modified) (1 diff)
• campaign_data.cc (modified) (1 diff)
• campaign_data.h (modified) (1 diff)
• game_world.cc (modified) (3 diffs)
• game_world.h (modified) (1 diff)
• game_world_data.cc (modified) (1 diff)
• game_world_data.h (modified) (1 diff)
• menu/game_menu.cc (modified) (2 diffs)
• menu/game_menu.h (modified) (1 diff)
• movie_loader.cc (modified) (1 diff)
• movie_loader.h (modified) (1 diff)
• multi_player_world.cc (modified) (1 diff)
• multi_player_world.h (modified) (1 diff)
• multi_player_world_data.cc (modified) (1 diff)
• single_player_world.cc (modified) (1 diff)
• single_player_world.h (modified) (1 diff)
• story_entity.cc (modified) (1 diff)
• story_entity.h (modified) (1 diff)

branches/new_class_id/src/story_entities/campaign.cc

@@ -27 +27 @@
 
 
-NewObjectListDefinition(Campaign);
+ObjectListDefinition(Campaign);
 
 /**

branches/new_class_id/src/story_entities/campaign.h

@@ -18 +18 @@
 class Campaign : public StoryEntity
 {
-  NewObjectListDeclaration(Campaign);
+  ObjectListDeclaration(Campaign);
   public:
     Campaign( TiXmlElement* root);

branches/new_class_id/src/story_entities/campaign_data.cc

@@ -25 +25 @@
 
 
-NewObjectListDefinition(CampaignData);
+ObjectListDefinition(CampaignData);
 
 /**

branches/new_class_id/src/story_entities/campaign_data.h

@@ -16 +16 @@
 class CampaignData : public DataTank
 {
-  NewObjectListDeclaration(CampaignData);
+  ObjectListDeclaration(CampaignData);
 
 public:

branches/new_class_id/src/story_entities/game_world.cc

@@ -62 +62 @@
 
 #include "script_class.h"
-NewObjectListDefinition(GameWorld);
+ObjectListDefinition(GameWorld);
 CREATE_SCRIPTABLE_CLASS(GameWorld, GameWorld::classID(),
                         addMethod("setPlaymode", ExecutorLua1<GameWorld,const std::string&>(&GameWorld::setPlaymode))
@@ -568 +568 @@
   MappedWater* mw;
 
-  for (NewObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
+  for (ObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
        it != MappedWater::objectList().end();
        ++it)
@@ -607 +607 @@
   MappedWater* mw;
 
-  for (NewObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
+  for (ObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
        it != MappedWater::objectList().end();
        ++it)

branches/new_class_id/src/story_entities/game_world.h

@@ -31 +31 @@
 class GameWorld : public StoryEntity
 {
-  NewObjectListDeclaration(GameWorld);
+  ObjectListDeclaration(GameWorld);
 
 public:

branches/new_class_id/src/story_entities/game_world_data.cc

@@ -61 +61 @@
 
 
-NewObjectListDefinition(GameWorldData);
+ObjectListDefinition(GameWorldData);
 /**
  * constructor of the GameWorldData

branches/new_class_id/src/story_entities/game_world_data.h

@@ -30 +30 @@
 class GameWorldData : public DataTank
 {
-  NewObjectListDeclaration(GameWorldData);
+  ObjectListDeclaration(GameWorldData);
   public:
     GameWorldData();

branches/new_class_id/src/story_entities/menu/game_menu.cc

@@ -44 +44 @@
 #include "class_id.h"
 //! This creates a Factory to fabricate a GameMenu
-NewObjectListDefinitionID(GameMenu, CL_GAME_MENU);
+ObjectListDefinitionID(GameMenu, CL_GAME_MENU);
 CREATE_FACTORY(GameMenu);
 
@@ -192 +192 @@
 
       bool first = true;
-      for(NewObjectList<StoryEntity>::const_iterator it = StoryEntity::objectList().begin();
+      for(ObjectList<StoryEntity>::const_iterator it = StoryEntity::objectList().begin();
           it != StoryEntity::objectList().end();
           ++it)

branches/new_class_id/src/story_entities/menu/game_menu.h

@@ -22 +22 @@
 class GameMenu : virtual public GameWorld, virtual public EventListener
 {
-  NewObjectListDeclaration(GameMenu);
+  ObjectListDeclaration(GameMenu);
   public:
     GameMenu(const TiXmlElement* root = NULL);

branches/new_class_id/src/story_entities/movie_loader.cc

@@ -26 +26 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(MovieLoader, CL_MOVIE_LOADER);
+ObjectListDefinitionID(MovieLoader, CL_MOVIE_LOADER);
 CREATE_FACTORY(MovieLoader);
 

branches/new_class_id/src/story_entities/movie_loader.h

@@ -15 +15 @@
 class MovieLoader : public StoryEntity, virtual public EventListener
 {
-  NewObjectListDeclaration(MovieLoader);
+  ObjectListDeclaration(MovieLoader);
   private:
     MoviePlayer* movie_player;

branches/new_class_id/src/story_entities/multi_player_world.cc

@@ -38 +38 @@
 #include "class_id.h"
 //! This creates a Factory to fabricate a MultiPlayerWorld
-NewObjectListDefinitionID(MultiPlayerWorld, CL_MULTI_PLAYER_WORLD);
+ObjectListDefinitionID(MultiPlayerWorld, CL_MULTI_PLAYER_WORLD);
 CREATE_FACTORY(MultiPlayerWorld);
 

branches/new_class_id/src/story_entities/multi_player_world.h

@@ -20 +20 @@
  */
 class MultiPlayerWorld : public GameWorld {
-  NewObjectListDeclaration(MultiPlayerWorld);
+  ObjectListDeclaration(MultiPlayerWorld);
  public:
   MultiPlayerWorld (const TiXmlElement* root = NULL);

branches/new_class_id/src/story_entities/multi_player_world_data.cc

@@ -311 +311 @@
   Playable* playable;
 
-  for (NewObjectList<Playable>::const_iterator entity = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator entity = Playable::objectList().begin();
        entity != Playable::objectList().end();
       ++entity)

branches/new_class_id/src/story_entities/single_player_world.cc

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

branches/new_class_id/src/story_entities/single_player_world.h

@@ -22 +22 @@
 class SinglePlayerWorld : public GameWorld
 {
-  NewObjectListDeclaration(SinglePlayerWorld);
+  ObjectListDeclaration(SinglePlayerWorld);
 
   public:

branches/new_class_id/src/story_entities/story_entity.cc

@@ -27 +27 @@
 
 
-NewObjectListDefinition(StoryEntity);
+ObjectListDefinition(StoryEntity);
 
 /**

branches/new_class_id/src/story_entities/story_entity.h

@@ -26 +26 @@
 class StoryEntity : virtual public BaseObject
 {
-  NewObjectListDeclaration(StoryEntity);
+  ObjectListDeclaration(StoryEntity);
 
 public: