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

Timestamp:

Jan 10, 2007, 5:33:19 PM (18 years ago)

Author:

nicolasc

Message:

bump

Location:

branches/playability/src/world_entities/projectiles

Files:

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

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

@@ -68 +68 @@
   this->weaponMan = new WeaponManager(dynamic_cast<WorldEntity*>(this));
   this->weaponMan->setParentEntity(this);
+  this->weaponMan->setSlotCount(1);
+  this->weaponMan->setSlotPosition(0, Vector(0, 0, 0));
+  this->weaponMan->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
   Weapon* cannon = new SpikeLauncher();
@@ -73 +76 @@
   this->weaponMan->addWeapon(cannon, 0, 0);
   this->weaponMan->changeWeaponConfig(0);
-
-  this->ttd = false;
 }
 
@@ -176 +177 @@
   this->shiftCoor(v);
 
-  if (this->tickLifeCycle(dt)){
-    this->weaponMan->getWeapon(0)->requestAction(WA_SHOOT);
-    if (this->ttd)
+  if(this->lifeCycle > .9){
+    printf("called by spikeball  ");
+    this->weaponMan->fire();
+  }
+
+  if (this->tickLifeCycle(dt))
       this->deactivate();
-    this->ttd = true;
-  }
 
   angle += rotationSpeed * dt;

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

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