Changeset 4875 in orxonox.OLD for orxonox

Timestamp:

Jul 16, 2005, 10:02:29 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: prepare to create the new Weapon-System

File:

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

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

@@ -51 +51 @@
   WS_IDLE          =    7,    //!< The State where the weapon is idle
 
-  WS_STATE_COUNT  =     8      //!< This must match the count of the enumerations-members.
+  WS_STATE_COUNT  =     8     //!< This must match the count of enumerations-members.
 } WeaponState;
 
@@ -95 +95 @@
   inline float getWeaponIdleTime() const { return this->idleTime; };
   /** @return true if idletime is elapsed else otherwise */
-  inline bool hasWeaponIdleTimeElapsed() const { return (this->localTime>this->idleTime)?true:false; };
+  inline bool hasWeaponIdleTimeElapsed() const { return (this->localTime > this->idleTime)?true:false; };
 
   /**  fires the weapon */
@@ -107 +107 @@
 
  protected:
-
   float                localTime;                        //<! this is the local time. important for shooting attributes like frequency
   float                idleTime;                         //<! the time a weapon needs before it can shoot again. eg. shooting frequency or actication/deactivateion delay
@@ -115 +114 @@
   // PHASES //
   ////////////
-  float                times[WS_STATE_COUNT];            //!< Times to stay in the different States @see WeaponState
-  SoundBuffer*         soundBuffers[WA_ACTION_COUNT];    //!< SoundBuffers for all actions @see WeaponAction
+  WeaponState          currentState;                     //!< The State the weapon is in.
+  float                stateTime;                        //!< how long the state has teken until now.
+  float                times[WS_STATE_COUNT];            //!< Times to stay in the different States @see WeaponState.
+  SoundBuffer*         soundBuffers[WA_ACTION_COUNT];    //!< SoundBuffers for all actions @see WeaponAction.
   Animation3D*         animation[WS_STATE_COUNT];        //!< Animations for all the States (you can say yourself on what part of the gun this animation acts).
-
 
   SoundBuffer*         fireSound;
   SoundSource*         weaponSource;
 
+  float                minCharge;
+  float                maxCharge;
 
  private:
-   WeaponState          state;                           //!< The state this weapon is in.
    bool                 enabled;                         //<! states if the weapon is enabled or not
    Projectile*          projectile;                      //<! the projectile used for this weapon