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

Timestamp:

Jul 20, 2005, 11:26:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: flush

File:

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

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

@@ -266 +266 @@
     // setting up for next action
     this->currentState = WS_ACTIVATING;
-    this->stateDuration = this->times[WA_ACTIVATE] + this->stateDuration;
+    this->stateDuration = this->times[WS_ACTIVATING] + this->stateDuration;
   }
   this->requestedAction = WA_NONE;
@@ -290 +290 @@
         // setting up for next action
     this->currentState = WS_DEACTIVATING;
-    this->stateDuration = this->times[WA_DEACTIVATE] + this->stateDuration;
+    this->stateDuration = this->times[WS_DEACTIVATING] + this->stateDuration;
   }
   this->requestedAction = WA_NONE;
@@ -314 +314 @@
     this->requestedAction = WA_NONE;
     this->currentState = WS_CHARGING;
-    this->stateDuration = this->times[WA_CHARGE] + this->stateDuration;
+    this->stateDuration = this->times[WS_CHARGING] + this->stateDuration;
   }
   else // deactivate the Weapon if we do not have enough energy
@@ -342 +342 @@
     this->energyLoaded -= this->minCharge;
           // setting up for the next state
-    this->stateDuration = this->times[WA_SHOOT] + this->stateDuration;
+    this->stateDuration = this->times[WS_SHOOTING] + this->stateDuration;
     this->currentState = WS_SHOOTING;
     this->requestedAction = WA_NONE;
@@ -390 +390 @@
   this->requestedAction = WA_NONE;
   this->currentState = WS_RELOADING;
-  this->stateDuration = this->times[WA_RELOAD] + this->stateDuration;
+  this->stateDuration = this->times[WS_RELOADING] + this->stateDuration;
 
 }
@@ -400 +400 @@
 void Weapon::tickW(float dt)
 {
+  printf("%s ", stateToChar(this->currentState));
+
   // setting up the timing properties
   this->stateDuration -= dt;
@@ -407 +409 @@
     if (this->stateDuration <= 0.0)
     {
-      if (unlikely (this->currentState != WS_DEACTIVATING))
+      if (unlikely (this->currentState == WS_DEACTIVATING))
+      {
+        this->currentState = WS_INACTIVE;
+        return;
+      }
+      else
         this->currentState = WS_IDLE;
-      else
-        this->currentState = WS_INACTIVE;
 
       if (this->requestedAction != WA_NONE)