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

Timestamp:

Jul 11, 2005, 5:43:37 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented aim

File:

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

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

@@ -32 +32 @@
 class TiXmlElement;
 
+//! An enumerator defining actions a Weapon can take
+typedef enum {
+  WA_NONE          =    0,    //!< No Action taken
+  WA_SHOOT         =    1,    //!< emitting Shot
+  WA_CHARGE        =    2,    //!< charge action (one click before the shot)
+  WA_RELOAD        =    3,    //!< reload right after shoot is finished
+  WA_ACTIVATE      =    4,    //!< activate the GUN
+  WA_DEACTIVATE    =    5,    //!< deactivate the GUN
+  WA_SPECIAL1      =    6,    //!< Special Action taken
 
-// typedef enum {
-//   W_SHOOT,
-//   W_EMPTY,
-//   W_RELOAD,
-//   W_SPECIAL1,
-//   W_SPECIAL2,
-//   W_SPECIAL3
-// } WeaponSoundType;
-
+  WA_ACTION_COUNT  =    6     //!< This must match the count of enumerations (without W_NONE)
+} WeaponActions;
 
 //! An enumerator defining the States of a Weapon
 typedef enum {
-  W_NONE          =    0,    //!< No State at all (if set, there is something wrong, or the weapon is not yet availiable)
-  W_SHOOT         =    1,    //!< The State of the Shooting
-  W_RELOAD        =    2,    //!< The State of the Reloading
-  W_ACTIVATING    =    3,    //!< The State in which the weapon gets activated
-  W_DEACTIVATING  =    4,    //!< The State in which the weapon gets deactivated
-  W_INACTIVE      =    5,    //!< The State where the weapon is inactive (unable to shoot)
-  W_IDLE          =    6,    //!< The State where the weapon is idle
+  WS_NONE          =    0,    //!< No State at all (if set, there is something wrong, or the weapon is not yet availiable)
+  WS_SHOOTING      =    1,    //!< The State of the Shooting
+  WS_RELOADING     =    3,    //!< The State of the Reloading
+  WS_ACTIVATING    =    4,    //!< The State in which the weapon gets activated
+  WS_DEACTIVATING  =    5,    //!< The State in which the weapon gets deactivated
+  WS_INACTIVE      =    6,    //!< The State where the weapon is inactive (unable to shoot)
+  WS_IDLE          =    7,    //!< The State where the weapon is idle
 
-  W_STATES_COUNT  =    6     //!< This must match the count of the enumerations (without W_NONE)
+  WS_STATE_COUNT  =    7     //!< This must match the count of the enumerations (without W_NONE)
 } WeaponState;
 
 
 //! a weapon can be left or right sided
+/**
+ * @todo this will be reset with mirror X/Y/Z
+ */
 #define    W_LEFT        0
 #define    W_RIGHT       1
@@ -99 +104 @@
   /** @brief fires the weapon */
   virtual void fire() = 0;
-  virtual void hit (WorldEntity* weapon, Vector* loc);
+  virtual void hit (WorldEntity* weapon, const Vector& loc);
   virtual void destroy();
 
@@ -107 +112 @@
 
  protected:
-  tList<WorldEntity>*  worldEntities;
 
-  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
-  float                slowDownFactor;            //<! if the shooting frequency is a linear function of time...
+  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
+  float                slowDownFactor;                   //<! if the shooting frequency is a linear function of time...
+
+  ////////////
+  // 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
+
+
 
   SoundBuffer*         fireSound;
@@ -118 +130 @@
 
  private:
-  bool                 enabled;                    //<! states if the weapon is enabled or not
-  Projectile*          projectile;          //<! the projectile used for this weapon
+  bool                 enabled;                          //<! states if the weapon is enabled or not
+  Projectile*          projectile;                       //<! the projectile used for this weapon
   //WeaponSound sound;
 };