Changeset 10698 in orxonox.OLD for trunk/src/world_entities/weapons/weapon_slot.h

Timestamp:

Jun 14, 2007, 5:33:43 PM (17 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

File:

• trunk/src/world_entities/weapons/weapon_slot.h (modified) (2 diffs)

trunk/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; }