Changeset 2852 for code/branches/weaponsystem/src/orxonox/objects/weaponSystem/Weapon.h

Timestamp:

Mar 26, 2009, 2:56:39 PM (15 years ago)

Author:

polakma

Message:

added unlimited munition, reverted shared munition and fixed some bugs

File:

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

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

@@ -69 +69 @@
             virtual void setMagazineLoadingTime(float loadingTime);
             virtual const float getMagazineLoadingTime();
-            virtual void setSharedMunition(bool bSharedMunition);
-            virtual const bool getSharedMunition();
             virtual void setBulletAmount(unsigned int amount);
             virtual const unsigned int getBulletAmount();
@@ -106 +104 @@
             bool bulletReadyToShoot_;
             bool magazineReadyToShoot_;
-            bool bSharedMunition_;
             bool unlimitedMunition_;
             float bulletLoadingTime_;