Changeset 10229 in orxonox.OLD for branches

Timestamp:

Jan 10, 2007, 6:47:42 PM (18 years ago)

Author:

nicolasc

Message:

spikeball still not working, doing a manual hack

Location:

branches/playability/src/world_entities

Files:

• projectiles/spike_ball.cc (modified) (2 diffs)
• weapons/weapon.cc (modified) (1 diff)

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

@@ -48 +48 @@
 
   this->setMinEnergy(1);
-  this->setHealthMax(0);
+  this->setHealthMax(1);
   this->lifeSpan = 1.0;
 
@@ -76 +76 @@
   this->weaponMan->addWeapon(cannon, 0, 0);
   this->weaponMan->changeWeaponConfig(0);
+
+  this->weaponMan->getWeapon(0)->increaseEnergy(50);
 }
 

branches/playability/src/world_entities/weapons/weapon.cc

@@ -586 +586 @@
 bool Weapon::fireW()
 {
+  printf("fireW Weapon\n");
   //if (likely(this->currentState != WS_INACTIVE))
   if (this->minCharge <= this->energy)