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

Timestamp:

Nov 20, 2005, 6:32:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new LoadParam procedure with all NON-cycling load-options, and it works perfectly (on first sight

now going to make the same for cycling LoadOptions

Location:

trunk/src/story_entities

Files:

• campaign.cc (modified) (1 diff)
• world.cc (modified) (2 diffs)

trunk/src/story_entities/campaign.cc

@@ -75 +75 @@
   static_cast<BaseObject*>(this)->loadParams(root);
 
-  //LoadParam<Campaign>(root, "identifier", this, &Campaign::setStoryID)
   LoadParamNEW(root, "identifier", this, Campaign, setStoryID)
      .describe("A Unique Identifier for this Campaign");
 
-//  LoadParam<Campaign>(root, "WorldList", this, &Campaign::loadWorldListParams)
    LoadParamXML(root, "WorldList", this, Campaign, loadWorldListParams)
       .describe("A List of Worlds to be loaded in this Campaign");

trunk/src/story_entities/world.cc

@@ -186 +186 @@
   PRINTF(4)("Creating a World\n");
 
-  LoadParam<World>(root, "identifier", this, &World::setStoryID)
+  LoadParamNEW(root, "identifier", this, World, setStoryID)
     .describe("Sets the StoryID of this world");
 
-  LoadParam<World>(root, "nextid", this, &World::setNextStoryID)
+  LoadParamNEW(root, "nextid", this, World, setNextStoryID)
     .describe("Sets the ID of the next world");
 
-  LoadParam<World>(root, "path", this, &World::setPath)
+  LoadParamNEW(root, "path", this, World, setPath)
     .describe("The Filename of this World (relative from the data-dir)");
 }
@@ -339 +339 @@
     //////////////////////////////
 
-    LoadParam<LightManager>(root, "LightManager", LightManager::getInstance(), &LightManager::loadParams);
-
-    LoadParam<ParticleEngine>(root, "ParticleEngine", ParticleEngine::getInstance(), &ParticleEngine::loadParams);
-    LoadParam<PhysicsEngine>(root, "PhysicsEngine", PhysicsEngine::getInstance(), &PhysicsEngine::loadParams);
+    LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
+
+    LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
+    LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
 
   // find Track