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

Timestamp:

Jan 17, 2006, 10:01:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loadParams is now virtual.
ALL THE CLASSES HAVE TO CALL

SuperClass::loadParams(root);

isntead of:
static_cast<SuperClass*>(this)→loadParams(root);

which was quite stupid anyways

Location:

trunk/src/story_entities

Files:

• campaign.cc (modified) (1 diff)
• campaign.h (modified) (1 diff)
• campaign_data.h (modified) (1 diff)
• dedicated_server_world.cc (modified) (1 diff)
• dedicated_server_world.h (modified) (1 diff)
• game_world.cc (modified) (1 diff)
• game_world.h (modified) (1 diff)
• multi_player_world.cc (modified) (1 diff)
• multi_player_world.h (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)

trunk/src/story_entities/campaign.cc

@@ -61 +61 @@
 void Campaign::loadParams(const TiXmlElement* root)
 {
-  static_cast<StoryEntity*>(this)->loadParams(root);
+  StoryEntity::loadParams(root);
 
   PRINTF(4)("Loaded Campaign specific stuff\n");

trunk/src/story_entities/campaign.h

@@ -23 +23 @@
     virtual ~Campaign ();
 
-    void loadParams(const TiXmlElement* root);
+    virtual void loadParams(const TiXmlElement* root);
 
     virtual bool start();

trunk/src/story_entities/campaign_data.h

@@ -21 +21 @@
     virtual ~CampaignData();
 
-    void loadParams(const TiXmlElement* root);
+    virtual void loadParams(const TiXmlElement* root);
 
     void loadData(const TiXmlElement* root);

trunk/src/story_entities/dedicated_server_world.cc

@@ -63 +63 @@
 void DedicatedServerWorld::loadParams(const TiXmlElement* root)
 {
-  static_cast<GameWorld*>(this)->loadParams(root);
+  GameWorld::loadParams(root);
 
   PRINTF(4)("Loaded DedicatedServerWorld specific stuff\n");

trunk/src/story_entities/dedicated_server_world.h

@@ -25 +25 @@
     virtual ~DedicatedServerWorld ();
 
-    void loadParams(const TiXmlElement* root);
+    virtual void loadParams(const TiXmlElement* root);
 
   private:

trunk/src/story_entities/game_world.cc

@@ -110 +110 @@
 void GameWorld::loadParams(const TiXmlElement* root)
 {
-  static_cast<StoryEntity*>(this)->loadParams(root);
+  StoryEntity::loadParams(root);
 
   LoadParam(root, "path", this, GameWorld, setPath)

trunk/src/story_entities/game_world.h

@@ -29 +29 @@
     virtual ~GameWorld ();
 
-    void loadParams(const TiXmlElement* root);
+    virtual void loadParams(const TiXmlElement* root);
 
     /* functions from story-entity */

trunk/src/story_entities/multi_player_world.cc

@@ -68 +68 @@
 void MultiPlayerWorld::loadParams(const TiXmlElement* root)
 {
-  static_cast<GameWorld*>(this)->loadParams(root);
+  GameWorld::loadParams(root);
 
   PRINTF(4)("Creating a MultiPlayerWorld\n");

trunk/src/story_entities/multi_player_world.h

@@ -25 +25 @@
   virtual ~MultiPlayerWorld ();
 
-  void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
   void debug();

trunk/src/story_entities/single_player_world.cc

@@ -71 +71 @@
 void SinglePlayerWorld::loadParams(const TiXmlElement* root)
 {
-  static_cast<GameWorld*>(this)->loadParams(root);
+  GameWorld::loadParams(root);
 
   PRINTF(4)("Loaded SinglePlayerWorld specific stuff\n");

trunk/src/story_entities/single_player_world.h

@@ -27 +27 @@
     virtual ~SinglePlayerWorld ();
 
-    void loadParams(const TiXmlElement* root);
+    virtual void loadParams(const TiXmlElement* root);
 };
 

trunk/src/story_entities/story_entity.cc

@@ -57 +57 @@
 void StoryEntity::loadParams(const TiXmlElement* root)
 {
-  static_cast<BaseObject*>(this)->loadParams(root);
+  BaseObject::loadParams(root);
 
   LoadParam(root, "identifier", this, StoryEntity, setStoryID)

trunk/src/story_entities/story_entity.h

@@ -30 +30 @@
   virtual ~StoryEntity ();
 
-  void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
   /* initialisation and loading */