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

Timestamp:

Dec 3, 2008, 6:26:53 PM (15 years ago)

Author:

polakma

Message:

fixed parentWeaponSystem-Pointer for all WeaponPacks and its Weapons

File:

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

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

@@ -52 +52 @@
             virtual void fire();
             void attachNeededMunition(std::string munitionType);
-            Munition * getAttachedMunition();
+            Munition * getAttachedMunition(std::string munitiontype);
 
             //reloading
@@ -83 +83 @@
 
         private:
+
+        protected:
             bool bulletReadyToShoot_;
             bool magazineReadyToShoot_;