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

Timestamp:

Jul 20, 2005, 11:26:16 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: flush

File:

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

orxonox/trunk/src/world_entities/weapons/weapon.h

@@ -157 +157 @@
 
   protected:
-    SoundSource*         soundSource;                      //!< A SoundSource to play sound from (this is connected to the PNode of the Weapon)
     // it is all about energy
     float                energy;                           //!< The energy stored in the weapons secondary buffers (reserve)
@@ -163 +162 @@
     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
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
@@ -170 +170 @@
     ////////////
   private:
+    SoundSource*         soundSource;                      //!< A SoundSource to play sound from (this is connected to the PNode of the Weapon)
+
     WeaponState          currentState;                     //!< The State the weapon is in.
     WeaponAction         requestedAction;                  //!< An action to try to Engage after the currentState ends.