Changeset 2918 for code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.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/Weapon.h (modified) (4 diffs)

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

@@ -22 +22 @@
  *   Author:
  *      Martin Polak
+ *      Fabian 'x3n' Landau
  *   Co-authors:
  *      ...
@@ -34 +35 @@
 
 #include "tools/Timer.h"
-#include "core/Identifier.h"
 
 namespace orxonox
@@ -46 +46 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            virtual void fire();
-            void attachNeededMunition(const std::string& munitionType);
-            Munition * getAttachedMunition(const std::string& munitiontype);
+            void fire(unsigned int mode);
+            void reload();
 
-            //reloading
-            void bulletTimer(float bulletLoadingTime);
-            void magazineTimer(float magazineLoadingTime);
-            void bulletReloaded();
-            void magazineReloaded();
+            void addWeaponmode(WeaponMode* weaponmode);
+            WeaponMode* getWeaponmode(unsigned int index) const;
 
-            //XMLPort functions
-            virtual void setMunitionType(const std::string& munitionType);
-            virtual const std::string& getMunitionType() const;
-            virtual void setBulletLoadingTime(float loadingTime);
-            virtual const float getBulletLoadingTime() const;
-            virtual void setMagazineLoadingTime(float loadingTime);
-            virtual const float getMagazineLoadingTime() const;
-            virtual void setBulletAmount(unsigned int amount);
-            virtual const unsigned int getBulletAmount() const;
-            virtual void setMagazineAmount(unsigned int amount);
-            virtual const unsigned int getMagazineAmount() const;
-            virtual void setUnlimitedMunition(bool unlimitedMunition);
-            virtual const bool getUnlimitedMunition() const;
-
-            //weapon actions
-            virtual void takeBullets();
-            virtual void takeMagazines();
-            virtual void createProjectile();
-            virtual void reloadBullet();
-            virtual void reloadMagazine();
-
-            //manually set or reset
-            virtual void setWeapon();
-            virtual void setMunition();
-
-            inline void setWeaponSystem(WeaponSystem *weaponSystem)
-                { this->weaponSystem_ = weaponSystem; };
-            inline WeaponSystem * getWeaponSystem() const
-                { return this->weaponSystem_; };
-
-            inline void setWeaponPack(WeaponPack *weaponPack)
-                { this->weaponPack_ = weaponPack; };
+            inline void setWeaponPack(WeaponPack * weaponPack)
+                { this->weaponPack_ = weaponPack; this->notifyWeaponModes(); }
             inline WeaponPack * getWeaponPack() const
-                { return this->weaponPack_; };
+                { return this->weaponPack_; }
 
             inline void setWeaponSlot(WeaponSlot * wSlot)
@@ -96 +62 @@
                 { return this->weaponSlot_; }
 
-        protected:
+        private:
+            void reloaded();
+            void notifyWeaponModes();
+
+            WeaponPack* weaponPack_;
+            WeaponSlot* weaponSlot_;
+            std::multimap<unsigned int, WeaponMode*> weaponmodes_;
+
+            Timer<Weapon> reloadTimer_;
             bool bReloading_;
-            bool bulletReadyToShoot_;
-            bool magazineReadyToShoot_;
-            bool unlimitedMunition_;
-            float bulletLoadingTime_;
-            float magazineLoadingTime_;
-            unsigned int bulletAmount_;
-            unsigned int magazineAmount_;
-            std::string munitionType_;
-
-            WeaponSlot * weaponSlot_;
-            Munition * munition_;
-            WeaponSystem * weaponSystem_;
-            WeaponPack* weaponPack_;
-
-            SubclassIdentifier<Munition> munitionIdentifier_;
-
-            Timer<Weapon> bulletReloadTimer_;
-            Timer<Weapon> magazineReloadTimer_;
+            unsigned int reloadingWeaponmode_;
     };
 }