Changeset 6376 in orxonox.OLD

Timestamp:

Dec 31, 2005, 4:11:34 PM (18 years ago)

Author:

patrick

Message:

network: load param is now processed correctly

Location:

branches/network/src/story_entities

Files:

• campaign.cc (modified) (1 diff)
• game_world.cc (modified) (1 diff)
• single_player_world.cc (modified) (1 diff)
• story_entity.cc (modified) (2 diffs)

branches/network/src/story_entities/campaign.cc

@@ -65 +65 @@
 void Campaign::loadParams(const TiXmlElement* root)
 {
-  static_cast<BaseObject*>(this)->loadParams(root);
-
-  LoadParam(root, "identifier", this, Campaign, setStoryID)
-  .describe("A Unique Identifier for this Campaign");
+  static_cast<StoryEntity*>(this)->loadParams(root);
 
   LoadParamXML(root, "WorldList", this, Campaign, loadWorldListParams)
   .describe("A List of Worlds to be loaded in this Campaign");
+
+  PRINTF(4)("Loaded Campaign specific stuff\n");
 }
 

branches/network/src/story_entities/game_world.cc

@@ -149 +149 @@
 void GameWorld::loadParams(const TiXmlElement* root)
 {
-  PRINTF(4)("Creating a GameWorld\n");
-
-  LoadParam(root, "identifier", this, GameWorld, setStoryID)
-    .describe("Sets the StoryID of this world");
-
-  LoadParam(root, "nextid", this, GameWorld, setNextStoryID)
-    .describe("Sets the ID of the next world");
+  static_cast<StoryEntity*>(this)->loadParams(root);
 
   LoadParam(root, "path", this, GameWorld, setPath)
     .describe("The Filename of this GameWorld (relative from the data-dir)");
+
+  PRINTF(4)("Loaded GameWorld specific stuff\n");
 }
 

branches/network/src/story_entities/single_player_world.cc

@@ -65 +65 @@
   static_cast<GameWorld*>(this)->loadParams(root);
 
-  PRINTF(4)("Creating a SinglePlayerWorld\n");
+  PRINTF(4)("Loaded SinglePlayerWorld specific stuff\n");
 }
 

branches/network/src/story_entities/story_entity.cc

@@ -19 +19 @@
 #include "story_entity.h"
 
+#include "load_param.h"
 
 using namespace std;
@@ -24 +25 @@
 
 /**
- * default constructor initializes all needed data
+ *  default constructor initializes all needed data
  */
 StoryEntity::StoryEntity ()
 {
   this->setClassID(CL_STORY_ENTITY, "StoryEntity");
+
   this->isInit = false;
   this->readyToRun = false;
   this->isPaused = false;
   this->isSuspended = false;
+
+  this->storyID = -1;
+  this->nextStoryID = WORLD_ID_GAMEEND;
 }
 
 
-/** deconstructor
+/**
+ *  deconstructor
  */
-StoryEntity::~StoryEntity () {}
+StoryEntity::~StoryEntity ()
+{}
 
 
+/**
+ *  loads the Parameters of a Campaign
+ * @param root: The XML-element to load from
+ */
+void StoryEntity::loadParams(const TiXmlElement* root)
+{
+  static_cast<BaseObject*>(this)->loadParams(root);
+
+  LoadParam(root, "identifier", this, StoryEntity, setStoryID)
+      .describe("A Unique Identifier for this StoryEntity");
+
+  LoadParam(root, "nextid", this, StoryEntity, setNextStoryID)
+      .describe("Sets the ID of the next StoryEntity");
+
+  PRINTF(4)("Loaded StoryEntity specific stuff\n");
+}