Changeset 4879 in orxonox.OLD for orxonox

Timestamp:

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

Author:

bensch

Message:

orxonox/branches/weaponSystem: some more definitions

Location:

orxonox/branches/weaponSystem/src/world_entities/weapons

Files:

• weapon.cc (modified) (2 diffs)
• weapon.h (modified) (3 diffs)

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

@@ -143 +143 @@
 {}
 
-
-/**
- *  is called, when there is no fire button pressed
-*/
-void Weapon::weaponIdle()
-{}
-
-
 /**
  *  this will draw the weapon
@@ -157 +149 @@
 {}
 
+
+
+
+
+/**
+ * Converts a String into an Action.
+ * @param action the String input holding the Action.
+ * @return The Action if known, WA_NONE otherwise.
+ */
+WeaponAction Weapon::charToAction(const char* action)
+{
+  if (!strcmp(action, "none"))
+    return WA_NONE;
+  else if (!strcmp(action, "shoot"))
+    return WA_SHOOT;
+  else if (!strcmp(action, "charge"))
+    return WA_CHARGE;
+  else if (!strcmp(action, "reload"))
+    return WA_RELOAD;
+  else if (!strcmp(action, "acitvate"))
+    return WA_ACTIVATE;
+  else if (!strcmp(action, "deactivate"))
+    return WA_DEACTIVATE;
+  else if (!strcmp(action, "special1"))
+    return WA_SPECIAL1;
+  else
+  {
+    PRINTF(2)("action %s could not be identified.\n", action);
+    return WA_NONE;
+  }
+}
+
+/**
+ * Converts a String into a State.
+ * @param state the String input holding the State.
+ * @return The State if known, WS_NONE otherwise.
+ */
+WeaponState Weapon::charToState(const char* state)
+{
+  if (!strcmp(state, "none"))
+    return WS_NONE;
+  else if (!strcmp(state, "shooting"))
+    return WS_SHOOTING;
+  else if (!strcmp(state, "reloading"))
+    return WS_RELOADING;
+  else if (!strcmp(state, "activating"))
+    return WS_ACTIVATING;
+  else if (!strcmp(state, "deactivating"))
+    return WS_DEACTIVATING;
+  else if (!strcmp(state, "inactive"))
+    return WS_INACTIVE;
+  else if (!strcmp(state, "idle"))
+    return WS_IDLE;
+  else
+  {
+    PRINTF(2)("state %s could not be identified.\n", state);
+    return WS_NONE;
+  }
+}
+

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.