Changeset 10672 in orxonox.OLD for branches/vs-enhencements/src/world_entities/weapons

Timestamp:

Jun 5, 2007, 11:01:09 PM (18 years ago)

Author:

nicolasc

Message:

version bump

Location:

branches/vs-enhencements/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (1 diff)
• weapon_slot.cc (modified) (1 diff)
• weapon_slot.h (modified) (2 diffs)

branches/vs-enhencements/src/world_entities/weapons/weapon_manager.cc

@@ -35 +35 @@
 /**
  * @brief this initializes the weaponManager for a given nnumber of weapon slots
- * @param number of weapon slots of the model/ship <= 8 (limitied)
+ * @param number of weapon slots of the model/ship <= 10 (limitied)
  */
 WeaponManager::WeaponManager(WorldEntity* parent)

branches/vs-enhencements/src/world_entities/weapons/weapon_slot.cc

@@ -57 +57 @@
   LoadParam(root, "slot", this, WeaponSlot, setWeaponConfig)
   .describe("sets the weapon slot");
+
+  LoadParam(root, "currentWeapon", this, WeaponSlot, setCurrentWeapon)
+  .describe("creates and set next weapon");
+
+  LoadParam(root, "nextWeapon", this, WeaponSlot, setNextWeapon)
+  .describe("creates and set next weapon");
 }
 

branches/vs-enhencements/src/world_entities/weapons/weapon_slot.h

@@ -8 +8 @@
 
 #include "p_node.h"
-
+#include "weapon.h"
 
 class Weapon;
@@ -36 +36 @@
   inline void setNextWeapon(Weapon* weapon) { this->nextWeapon = weapon; }
 
+  inline void setNextWeapon(const std::string& weaponName){this->nextWeapon = Weapon::createWeapon(weaponName); };
+  inline void setCurrentWeapon(const std::string& weaponName){ this->currentWeapon = Weapon::createWeapon(weaponName); };
+
 
   inline void setWeaponConfig(int slot, int side) { this->weaponSlot = slot; this->weaponSide = side; }