Changeset 4906 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon.cc

Timestamp:

Jul 20, 2005, 1:41:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: states are now flow'n through

File:

• orxonox/trunk/src/world_entities/weapons/weapon.cc (modified) (12 diffs)

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

@@ -81 +81 @@
   this->emissionPoint.setParent(this);
 
-  this->active = true;
   this->projectile = NULL;
+
+  this->hideInactive = true;
 
   this->minCharge = 1.0;
@@ -171 +172 @@
 void Weapon::requestAction(WeaponAction action)
 {
-  if (this->requestedAction != WA_NONE)
-    return;
-  else
-  {
+  if (likely(this->isActive()))
+  {
+    if (this->requestedAction != WA_NONE)
+      return;
     printf("next action will be %s in %f seconds\n", actionToChar(action), this->stateDuration);
     this->requestedAction = action;
+  }
+  //else
+  else if (unlikely(action == WA_ACTIVATE))
+  {
+    this->currentState = WS_ACTIVATING;
+    this->requestAction(WA_ACTIVATE);
   }
 }
@@ -215 +222 @@
 bool Weapon::execute()
 {
-
+#if DEBUG > 4
   PRINTF(4)("trying to execute action %s\n", actionToChar(this->requestedAction));
   this->debug();
+#endif
 
   switch (this->requestedAction)
@@ -246 +254 @@
 bool Weapon::activateW()
 {
-//  if (this->currentState == WS_INACTIVE)
+  if (this->currentState == WS_INACTIVE)
   {
         // play Sound
@@ -256 +264 @@
     PRINTF(4)("Activating the Weapon %s\n", this->getName());
     this->activate();
-    this->active = true;
     // setting up for next action
+    this->currentState = WS_ACTIVATING;
     this->stateDuration = this->times[WA_ACTIVATE] + this->stateDuration;
   }
@@ -280 +288 @@
         // deactivate
     this->deactivate();
-    this->active = false;
         // setting up for next action
+    this->currentState = WS_DEACTIVATING;
     this->stateDuration = this->times[WA_DEACTIVATE] + this->stateDuration;
   }
@@ -305 +313 @@
         // setting up for the next state
     this->requestedAction = WA_NONE;
+    this->currentState = WS_CHARGING;
     this->stateDuration = this->times[WA_CHARGE] + this->stateDuration;
   }
@@ -334 +343 @@
           // setting up for the next state
     this->stateDuration = this->times[WA_SHOOT] + this->stateDuration;
+    this->currentState = WS_SHOOTING;
     this->requestedAction = WA_NONE;
   }
@@ -379 +389 @@
 
   this->requestedAction = WA_NONE;
+  this->currentState = WS_RELOADING;
   this->stateDuration = this->times[WA_RELOAD] + this->stateDuration;
 
@@ -387 +398 @@
  * tick signal for time dependent/driven stuff
 */
-void Weapon::tick(float dt)
+void Weapon::tickW(float dt)
 {
   // setting up the timing properties
@@ -394 +405 @@
   if (this->isActive())
   {
-    if (this->stateDuration <= 0.0 && this->requestedAction != WA_NONE)
-    {
-      this->stateDuration = -dt;
-      this->execute();
-    }
-  }
-  else
-    if (this->requestedAction == WA_ACTIVATE)
-      this->activate();
-
+    if (this->stateDuration <= 0.0)
+    {
+      if (unlikely (this->currentState != WS_DEACTIVATING))
+        this->currentState = WS_IDLE;
+      else
+        this->currentState = WS_INACTIVE;
+
+      if (this->requestedAction != WA_NONE)
+      {
+        this->stateDuration = -dt;
+        this->execute();
+      }
+    }
+  }
+  tick(dt);
 }
 
@@ -569 +585 @@
       return "idle";
       break;
+    case WS_INACTIVE:
+      return "inactive";
+      break;
     default:
       return "none";