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

Timestamp:

Jun 11, 2005, 3:08:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: campaign now gets loaded via LoadParam

Location:

orxonox/trunk/src/story_entities

Files:

• campaign.cc (modified) (1 diff)
• campaign.h (modified) (1 diff)

orxonox/trunk/src/story_entities/campaign.cc

@@ -41 +41 @@
 Campaign::Campaign ( TiXmlElement* root)
 {
-  //! \todo loading with load_param....
   this->setClassID(CL_CAMPAIGN, "Campaign");
+
+  PRINTF(3)("Loading Campaign...\n");
+
+  assert( root != NULL);
+
+  this->entities = new tList<StoryEntity>();
+  this->isInit = false;
+
+  this->loadParams(root);
+
+
+  //if( lastCreated != NULL)
+  //lastCreated->setStoryID( WORLD_ID_GAMEEND);
+}
+
+Campaign::~Campaign () {}
+
+
+ErrorMessage Campaign::init()
+{
+  this->isInit = true;
+}
+
+/**
+  \brief loads the Parameters of a Campaign
+  \param root: The XML-element to load from
+ */
+void Campaign::loadParams(const TiXmlElement* root)
+{
   TiXmlElement* element;
   const char* string;
-  int id;
-
-  PRINTF(3)("Loading Campaign...\n");
-
-  assert( root != NULL);
-  GameLoader* loader = GameLoader::getInstance();
-
-  this->entities = new tList<StoryEntity>();
-  this->isInit = false;
-
-  // grab all the necessary parameters
-  string = grabParameter( root, "identifier");
-  if( string == NULL || sscanf(string, "%d", &id) != 1)
-    {
-      PRINTF(2)("Campaign is missing a proper 'identifier'\n");
-      this->setStoryID( -1);
-    }
-  else this->setStoryID( id);
-
-  // find WorldList
-  element = root->FirstChildElement( "WorldList");
-  if( element == NULL)
-    {
-      PRINTF(2)("Campaign is missing a proper 'WorldList'\n");
-    }
-  else
-    element = element->FirstChildElement();
-
+
+  LoadParam<Campaign>(root, "identifier", this, &Campaign::setStoryID);
+
+  LoadParam<Campaign>(root, "WorldList", this, &Campaign::loadWorldListParams, root->FirstChildElement("WorldList"));
+}
+
+/**
+  \brief loads a WorldList
+  \param root: the XML-element to load from
+ */
+void Campaign::loadWorldListParams(const TiXmlElement* root)
+{
+  const TiXmlElement* element = root->FirstChildElement();
   // load Worlds/Subcampaigns/Whatever
   StoryEntity* lastCreated = NULL;
   while( element != NULL)
-    {
-      printf("Campaign: Constructor: adding a world\n");
-      StoryEntity* created = (StoryEntity*) loader->fabricate( element);
+  {
+    printf("Campaign: Constructor: adding a world\n");
+    StoryEntity* created = (StoryEntity*) GameLoader::getInstance()->fabricate(element);
       /*
-      if( lastCreated != NULL)
-        created->setNextStoryID( lastCreated->getStoryID());
-      else
-        created->setNextStoryID( WORLD_ID_GAMEEND);
+    if( lastCreated != NULL)
+    created->setNextStoryID( lastCreated->getStoryID());
+    else
+    created->setNextStoryID( WORLD_ID_GAMEEND);
       */
-      if( created != NULL)
-        {
-          this->addEntity( created);
-          lastCreated = created;
-        }
-      element = element->NextSiblingElement();
-    }
-  //if( lastCreated != NULL)
-  //lastCreated->setStoryID( WORLD_ID_GAMEEND);
-}
-
-Campaign::~Campaign () {}
-
-
-ErrorMessage Campaign::init()
-{
-  this->isInit = true;
-}
-
+    if( created != NULL)
+    {
+      this->addEntity( created);
+      lastCreated = created;
+    }
+    element = element->NextSiblingElement();
+  }
+}
 
 ErrorMessage Campaign::start()

orxonox/trunk/src/story_entities/campaign.h

@@ -17 +17 @@
   Campaign ( TiXmlElement* root);
   virtual ~Campaign ();
+
+  void loadParams(const TiXmlElement* root);
+  void loadWorldListParams(const TiXmlElement* root);
 
   StoryEntity* currentEntity;