Changeset 2391 for code/branches/weapon2/src/orxonox/objects/weaponSystem/Munition.h

Timestamp:

Dec 10, 2008, 5:30:39 PM (15 years ago)

Author:

polakma

Message:

fixed projectile, particle effect, reloadingTimer and magazineTimer

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/Munition.h (modified) (1 diff)

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

@@ -53 +53 @@
             void fillMagazines();
 
-            bool bullets();
-            bool magazines();
+            unsigned int bullets();
+            unsigned int magazines();
 
-            void removeBullets(unsigned int k, Weapon * parentWeapon);
+            void removeBullets(unsigned int k);
             void removeMagazines(unsigned int k);
             void addBullets(unsigned int k);