Changeset 5644 in orxonox.OLD for trunk

Timestamp:

Nov 19, 2005, 5:08:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better loadparam start and end-cycle.

Location:

trunk/src

Files:

• lib/shell/shell_command_class.cc (modified) (1 diff)
• lib/util/multi_type.h (modified) (1 diff)
• util/loading/load_param.h (modified) (1 diff)
• util/track/track_manager.cc (modified) (2 diffs)
• world_entities/weapons/weapon_manager.cc (modified) (4 diffs)

trunk/src/lib/shell/shell_command_class.cc

@@ -221 +221 @@
 }
 
+/**
+ * displays help about ShellCommandClass
+ * @param className: the Class of Commands to show help about
+ */
 void ShellCommandClass::help(const char* className)
 {

trunk/src/lib/util/multi_type.h

@@ -22 +22 @@
   MT_EXT1            = 32,                 //!< An external Type.
   MT_EXT2            = 64,                 //!< An external Type.
-
 } MT_Type;
 

trunk/src/util/loading/load_param.h

@@ -75 +75 @@
  * called element, and that you must say true at the Fith parameter, or it will fail
  * also you will have to close the Cycle again with LOAD_PARAM_END_CYCLE
- */
-#define LOAD_PARAM_START_CYCLE   const TiXmlElement* element; \
-                                 element = root->FirstChildElement(); \
-                                 while( element != NULL) \
-{
-/**
-   * closes a LoadParam Loop
-   * @see LOAD_PARAM_START_CYCLE
- */
-#define LOAD_PARAM_END_CYCLE        element = element->NextSiblingElement(); \
-}
+ * @param ROOT The root XLM-element to search element under.
+ * @param ELEMENT the element to search
+ */
+#define LOAD_PARAM_START_CYCLE(ROOT, ELEMENT) \
+  const TiXmlElement* ELEMENT; \
+  ELEMENT= ROOT->FirstChildElement(); \
+  while( ELEMENT != NULL) \
+  {
+/**
+ * closes a LoadParam Loop
+ * @see LOAD_PARAM_START_CYCLE
+ * @param ELEMENT the Element to step through.
+ */
+#define LOAD_PARAM_END_CYCLE(ELEMENT) \
+  ELEMENT = ELEMENT->NextSiblingElement(); \
+  }
 
 

trunk/src/util/track/track_manager.cc

@@ -398 +398 @@
   double x, y, z, d;
 
-  LOAD_PARAM_START_CYCLE
+  LOAD_PARAM_START_CYCLE(root, element)
 
       LoadParam<TrackManager>(element, "WorkOn", this, &TrackManager::workOnS, true)
@@ -445 +445 @@
         }
       */
-      LOAD_PARAM_END_CYCLE;
+      LOAD_PARAM_END_CYCLE(element);
 }
 

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -122 +122 @@
       .describe("how many slots(cannons) the WeaponManager can handle");
 
-  LOAD_PARAM_START_CYCLE;
+  LOAD_PARAM_START_CYCLE(root, element);
 
   LoadParam<WeaponManager>(element, "weapons", this, &WeaponManager::loadWeapons)
@@ -128 +128 @@
       // LoadParam<WeaponManager>(root, "Weapon", this, &WeaponManager::addWeapon);
 
-  LOAD_PARAM_END_CYCLE;
+  LOAD_PARAM_END_CYCLE(element);
 }
 
@@ -137 +137 @@
 void WeaponManager::loadWeapons(const TiXmlElement* root)
 {
-  LOAD_PARAM_START_CYCLE;
+  LOAD_PARAM_START_CYCLE(root, element);
 
   Weapon* newWeapon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(element));
@@ -143 +143 @@
 
 
-  LOAD_PARAM_END_CYCLE;
+  LOAD_PARAM_END_CYCLE(element);
 }