Changeset 5654 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Nov 20, 2005, 9:12:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cycle-loading of LoadParam works…

Location:

trunk/src/world_entities

Files:

• terrain.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/terrain.cc

@@ -106 +106 @@
   LoadParamNEW(root, "vegetation", this, Terrain, loadVegetation)
       .describe("the fileName of the vegetation, that should be loaded onto this terrain. (must be relative to the data-dir)") ;
-
-  //LoadParam<Terrain>(root, "DebugTerrain",  );
 }
 

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -123 +123 @@
 
   LOAD_PARAM_START_CYCLE(root, element);
-
-
-  LoadParamXML(element, "weapons", this, WeaponManager, loadWeapons)
-      .describe("loads Weapons");
-
+  {
+    // CHECK IF THIS WORKS....
+    LoadParamXML_CYCLE(element, "weapons", this, WeaponManager, loadWeapons)
+        .describe("loads Weapons");
+  }
   LOAD_PARAM_END_CYCLE(element);
 }