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

Timestamp:

Jul 24, 2005, 3:11:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new Definitions in the WeaponManager-class

File:

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

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

@@ -301 +301 @@
 bool Weapon::deactivateW()
 {
-  if (this->currentState != WS_INACTIVE)
+//  if (this->currentState != WS_INACTIVE)
   {
     PRINTF(4)("Deactivating the Weapon %s\n", this->getName());
@@ -403 +403 @@
 inline void Weapon::enterState(WeaponState state)
 {
+  PRINTF(3)("ENTERING STATE %s\n", stateToChar(state));
   // playing animation if availiable
   if (likely(this->animation[state] != NULL))
@@ -427 +428 @@
   this->stateDuration -= dt;
 
-  if (this->isActive())
-  {
-    if (this->stateDuration <= 0.0)
-    {
-      if (unlikely (this->currentState == WS_DEACTIVATING))
-      {
-        this->currentState = WS_INACTIVE;
-        return;
-      }
-      else
-        this->currentState = WS_IDLE;
-
-      if (this->requestedAction != WA_NONE)
-      {
-        this->stateDuration = -dt;
-        this->execute();
-      }
+  if (this->stateDuration <= 0.0)
+  {
+    if (unlikely (this->currentState == WS_DEACTIVATING))
+    {
+      this->currentState = WS_INACTIVE;
+      return;
+    }
+    else
+      this->currentState = WS_IDLE;
+
+    if (this->requestedAction != WA_NONE)
+    {
+      this->stateDuration = -dt;
+      this->execute();
     }
   }