Changeset 10217 in orxonox.OLD for branches/playability/src/world_entities/projectiles

Timestamp:

Jan 10, 2007, 3:37:40 PM (18 years ago)

Author:

nicolasc

Message:

bump

Location:

branches/playability/src/world_entities/projectiles

Files:

• spike_ball.cc (modified) (2 diffs)
• spike_ball.h (modified) (1 diff)

branches/playability/src/world_entities/projectiles/spike_ball.cc

@@ -74 +74 @@
   this->weaponMan->changeWeaponConfig(0);
 
-
+  this->ttd = false;
 }
 
@@ -177 +177 @@
 
   if (this->tickLifeCycle(dt)){
-    this->weaponMan->fire();
-    this->deactivate();
+    this->weaponMan->getWeapon(0)->requestAction(WA_SHOOT);
+    if (this->ttd)
+      this->deactivate();
+    this->ttd = true;
   }
 

branches/playability/src/world_entities/projectiles/spike_ball.h

@@ -65 +65 @@
     WeaponManager*                   weaponMan;
 
+    bool                             ttd;
 };