Changeset 2918 for code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.h

Timestamp:

Apr 18, 2009, 6:14:52 PM (16 years ago)

Author:

landauf

Message:

Added many new features in the Munition class:

• there are now 3 modes: a) every weapon has it's own magazine b) all weapons use the same magazin c) no magazines, just a big munition pool
• the Munition class handles the reloading of the magazine

Split the Weapon class into Weapon and WeaponMode. WeaponMode creates the fire of the Weapon. A weapon can own several WeaponModes (for example primary and secondary fire). But it's also possible to have a weapon with several muzzles which all fire at the same time (there's a WeaponMode for each muzzle).

Renamed LaserGun to LaserFire and Fusion to FusionFire. They inherit now from WeaponMode.

Changed the code in the Weapon class to use the new Munition functionality.

Added ReplenishingMunition, a subclass of Munition that replenishes itself (used for LaserGunMunition).

Added a reload command to reload magazines.

File:

• code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.h (modified) (3 diffs)

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

@@ -20 +20 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- *   Author:
+ *   Authors:
  *      Martin Polak
+ *      Fabian 'x3n' Landau
  *   Co-authors:
  *      ...
@@ -31 +32 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <map>
+
 #include "core/BaseObject.h"
+#include "tools/Timer.h"
 
 namespace orxonox
@@ -37 +42 @@
     class _OrxonoxExport Munition : public BaseObject
     {
+        struct Magazine
+        {
+            public:
+                Magazine(Munition* munition, bool bUseReloadTime = true);
+
+                unsigned int munition_;
+                Timer<Magazine> loadTimer_;
+                bool bLoaded_;
+
+            private:
+                void loaded(Munition* munition);
+        };
+
         public:
             Munition(BaseObject* creator);
             virtual ~Munition();
 
-            void setMaxBullets(unsigned int amount);
-            void setMaxMagazines(unsigned int amount);
+            unsigned int getNumMunition(WeaponMode* user) const;
+            unsigned int getNumMunitionInCurrentMagazine(WeaponMode* user) const;
+            unsigned int getNumMagazines() const;
 
-            void fillBullets();
-            void fillMagazines();
+            unsigned int getMaxMunition() const;
+            inline unsigned int getMaxMagazines() const
+                { return this->maxMagazines_; }
+            inline unsigned int getMaxMunitionPerMagazine() const
+                { return this->maxMunitionPerMagazine_; }
 
-            unsigned int bullets();
-            unsigned int magazines();
+            bool canTakeMunition(unsigned int amount, WeaponMode* user) const;
+            bool takeMunition(unsigned int amount, WeaponMode* user);
 
-            void removeBullets(unsigned int k);
-            void removeMagazines(unsigned int k);
-            void addBullets(unsigned int k);
-            void addMagazines(unsigned int k);
+            bool canReload() const;
+            bool needReload(WeaponMode* user) const;
+            bool reload(WeaponMode* user, bool bUseReloadTime = true);
+            inline float getReloadTime() const
+                { return this->reloadTime_; }
+
+            bool canAddMunition(unsigned int amount) const;
+            bool addMunition(unsigned int amount);
+
+            bool canAddMagazines(unsigned int amount) const;
+            bool addMagazines(unsigned int amount);
+
+            bool canRemoveMagazines(unsigned int amount) const;
+            bool removeMagazines(unsigned int amount);
+
+            bool dropMagazine(WeaponMode* user);
+
+        protected:
+            unsigned int maxMunitionPerMagazine_;
+            unsigned int maxMagazines_;
+            unsigned int magazines_;
+            std::map<WeaponMode*, Magazine*> currentMagazines_;
+
+            bool bUseSeparateMagazines_;
+            bool bStackMunition_;
+            bool bAllowMunitionRefilling_;
+            bool bAllowMultiMunitionRemovementUnderflow_;
+
+            float reloadTime_;
 
         private:
-
-        protected:
-            unsigned int bullets_;
-            unsigned int magazines_;
-            unsigned int maxBullets_;
-            unsigned int maxMagazines_;
+            Magazine* getMagazine(WeaponMode* user) const;
     };
 }