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

Timestamp:

Jan 25, 2006, 9:28:18 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: Weapons are ticked only if they are inside of a ticked OM_LIST (not by the WeaponManager anymore)

File:

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

trunk/src/world_entities/weapons/weapon.cc

@@ -538 +538 @@
  * tick signal for time dependent/driven stuff
 */
-void Weapon::tickW(float dt)
+bool Weapon::tickW(float dt)
 {
   //printf("%s ", stateToChar(this->currentState));
@@ -550 +550 @@
     {
       this->currentState = WS_INACTIVE;
-      return;
+      return false;
     }
     else
@@ -561 +561 @@
     }
   }
-  tick(dt);
+  return true;
 }