Changeset 2331 for code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h

Timestamp:

Dec 3, 2008, 5:13:34 PM (15 years ago)

Author:

polakma

Message:

fixed attaching

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h (modified) (2 diffs)

code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h

@@ -70 +70 @@
             Timer<Weapon> *getMagazineTimer();
 
+            void setMunitionType(std::string munitionType);
+            std::string getMunitionType();
+
             inline void setParentWeaponSlot(WeaponSlot *parentWeaponSlot)
                 { this->parentWeaponSlot_=parentWeaponSlot; };
@@ -85 +88 @@
             float magazineLoadingTime_;
             Munition *munition_;
+            std::string munitionType_;
 
             WeaponSlot *parentWeaponSlot_;