Changeset 6671 in orxonox.OLD for trunk/src/world_entities/weapons/weapon.h

Timestamp:

Jan 24, 2006, 2:52:25 PM (18 years ago)

Author:

bensch

Message:

WeaponManger now handles Ammo.
If a Weapon has NO ammo then the Ammo will be infinite

File:

• trunk/src/world_entities/weapons/weapon.h (modified) (4 diffs)

trunk/src/world_entities/weapons/weapon.h

@@ -137 +137 @@
     inline WeaponState getCurrentState() const { return this->currentState; };
 
-    /** @param energyMax the maximum energy the Weapon can have @param energyLoadedMax the maximum energy in the weapon buffers */
-    inline void setMaximumEnergy(float energyMax, float energyLoadedMax) { this->energyMax = energyMax; this->energyLoadedMax = energyLoadedMax; };
-    inline float getLoadedEnergyMax() const { return this->energyLoadedMax; };
+    /** @param energyMax the maximum energy the Weapon can have */
+    inline void setEnergyMax(float energyMax) { this->energyMax = energyMax; };
+    inline float getEnergy() const { return this->energy; };
     inline float getEnergyMax() const { return this->energyMax; };
     inline void setAmmoContainer(const CountPointer<AmmoContainer>& ammoContainer) { this->ammoContainer = ammoContainer;}
-    inline float getEnergy() const { return this->energy; };
-    inline float getLoadedEnergy() const { return this->energyLoaded; };
 
     void setActionSound(WeaponAction action, const char* soundFile);
@@ -153 +151 @@
 
     GLGuiWidget* getEnergyWidget();
-    GLGuiWidget* getLoadedEnergyWidget();
 
     // FLOW
@@ -201 +198 @@
 
     // it is all about energy
-    float                energy;                           //!< The energy stored in the weapons secondary buffers (reserve)
-    float                energyLoaded;                     //!< The energy stored in the weapons primary buffers (fire without reload)
+    float                energy;                           //!< The energy stored in the weapons buffers
+    float                energyMax;                        //!< The maximal energy that can be stored in the secondary buffers (reserveMax)
     CountPointer<AmmoContainer> ammoContainer;             //!< Pointer to the AmmoContainer this weapon grabs Energy from.
-    float                energyMax;                        //!< The maximal energy that can be stored in the secondary buffers (reserveMax)
-    float                energyLoadedMax;                  //!< The maximal energy that can be stored in the primary buffers
     //! @todo move this to projectile
     float                minCharge;                        //!< The minimal energy to be loaded onto one projectile if chargeable otherwise the power consumed by one projectile
@@ -211 +206 @@
 
     GLGuiBar*            energyWidget;
-    GLGuiBar*            energyLoadedWidget;
 
     ////////////