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

Timestamp:

Nov 19, 2008, 7:07:36 PM (15 years ago)

Author:

polakma

Message:

added new features to munition.h and weapon.h. tried to fix projectiles (still doesn't compile)

File:

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

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

@@ -34 +34 @@
 #include "core/BaseObject.h"
 
+#include "Weapon.h"
+
 
 namespace orxonox
@@ -45 +47 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void decrementBullets();
-            void decrementMagazines();
-            void incrementBullets();
-            void incrementMagazines();
+            void setMaxBullets(unsigned int amount);
+            void setMaxMagazines(unsigned int amount);
+
+            unsigned int getBullets();
+            unsigned int getMagazines();
+
+            void removeBullets(unsigned int k, Weapon * parentWeapon);
+            void removeMagazines(unsigned int k);
+            void addBullets(unsigned int k);
+            void addMagazines(unsigned int k);
 
         private:
-            int bullets;
-            int magazines;
+            unsigned int bullets_;
+            unsigned int magazines_;
+            unsigned int maxBullets_;
+            unsigned int maxMagazines_;
     };
 }