Changeset 4879 in orxonox.OLD for orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.h

Timestamp:

Jul 17, 2005, 12:52:07 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/weaponSystem: some more definitions

File:

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

orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.h

@@ -39 +39 @@
 
   WA_ACTION_COUNT  =    7     //!< This must match the count of enumerations-members.
-} WeaponActions;
+} WeaponAction;
 
 //! An enumerator defining the States of a Weapon
@@ -100 +100 @@
 
   virtual void tick(float time);
-  virtual void weaponIdle();
   virtual void draw();
+
+  private:
+    static WeaponAction  charToAction(const char* action);
+    static WeaponState   charToState(const char* state);
+
 
  protected:
@@ -108 +112 @@
   ////////////
   WeaponState          currentState;                     //!< The State the weapon is in.
+  WeaponAction         requestAction;                    //!< An action to try to Engage after the currentState ends.
   float                stateTime;                        //!< how long the state has taken until now.
   float                times[WS_STATE_COUNT];            //!< Times to stay in the different States @see WeaponState.