Changeset 5652 in orxonox.OLD for trunk/src/world_entities/weapons

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/world_entities/weapons

Files:

• aim.cc (modified) (1 diff)
• crosshair.cc (modified) (1 diff)
• weapon.cc (modified) (1 diff)
• weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/weapons/aim.cc

@@ -70 +70 @@
   static_cast<PNode*>(this)->loadParams(root);
 
-  LoadParam<Aim>(root, "texture", this, &Aim::setTexture)
+  LoadParamNEW(root, "texture", this, Aim, setTexture)
       .describe("the texture-file to load onto the Aim");
 
-  LoadParam<Aim>(root, "size", this, &Aim::setSize)
+  LoadParamNEW(root, "size", this, Aim, setSize)
       .describe("the size of the Aim in Pixels");
 
-  LoadParam<Aim>(root, "rotation-speed", this, &Aim::setRotationSpeed)
+  LoadParamNEW(root, "rotation-speed", this, Aim, setRotationSpeed)
       .describe("the Speed with which the Aim should rotate");
 }

trunk/src/world_entities/weapons/crosshair.cc

@@ -84 +84 @@
   static_cast<EventListener*>(this)->loadParams(root);
 
-  LoadParam<Crosshair>(root, "texture", this, &Crosshair::setTexture)
+  LoadParamNEW(root, "texture", this, Crosshair, setTexture)
       .describe("the texture-file to load onto the Crosshair");
 
-  LoadParam<Crosshair>(root, "size", this, &Crosshair::setSize)
+  LoadParamNEW(root, "size", this, Crosshair, setSize)
       .describe("the size of the Crosshair in Pixels");
 
-  LoadParam<Crosshair>(root, "rotation-speed", this, &Crosshair::setRotationSpeed)
+  LoadParamNEW(root, "rotation-speed", this, Crosshair, setRotationSpeed)
       .describe("the Speed with which the Crosshair should rotate");
 }

trunk/src/world_entities/weapons/weapon.cc

@@ -109 +109 @@
   static_cast<WorldEntity*>(this)->loadParams(root);
 
-  LoadParam<Weapon>(root, "projectile", this, &Weapon::setProjectileType)
+  LoadParamNEW(root, "projectile", this, Weapon, setProjectileType)
       .describe("Sets the name of the Projectile to load onto the Entity");
 
-  LoadParam<Weapon>(root, "emission-point", this, &Weapon::setEmissionPoint)
+  LoadParamNEW(root, "emission-point", this, Weapon, setEmissionPoint)
       .describe("Sets the Point of emission of this weapon");
 
-  LoadParam<Weapon>(root, "state-duration", this, &Weapon::setStateDuration)
+  LoadParamNEW(root, "state-duration", this, Weapon, setStateDuration)
       .describe("Sets the duration of a given state (1: state-Name; 2: duration in seconds)");
 
-  LoadParam<Weapon>(root, "action-sound", this, &Weapon::setActionSound)
+  LoadParamNEW(root, "action-sound", this, Weapon, setActionSound)
       .describe("Sets a given sound to an action (1: action-Name; 2: name of the sound (relative to the Data-Path))");
 }

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -119 +119 @@
   static_cast<BaseObject*>(this)->loadParams(root);
 
-  LoadParam<WeaponManager>(root, "slot-count", this, &WeaponManager::setSlotCount)
+  LoadParamNEW(root, "slot-count", this, WeaponManager, setSlotCount)
       .describe("how many slots(cannons) the WeaponManager can handle");