Changeset 10758 in orxonox.OLD for branches/presentation/src/world_entities/projectiles

Timestamp:

Jun 21, 2007, 1:37:21 AM (17 years ago)

Author:

nicolasc

Message:

added shield functionality, reverted paeddae's MP patch - does not work

Location:

branches/presentation/src/world_entities/projectiles

Files:

• hbolt.cc (modified) (2 diffs)
• nadion_blast.cc (modified) (1 diff)
• plasma_pulse.cc (modified) (1 diff)

branches/presentation/src/world_entities/projectiles/hbolt.cc

@@ -51 +51 @@
   this->setHealthMax(0);
   this->lifeSpan = 3.0;
-
+  this->setDamage(10);
   this->angle = 0;
 //   this->rotationSpeed = 600;
@@ -135 +135 @@
   if (this->hitEntity != entity/* && entity->isA(NPC::staticClassID())*/ && entity->isA(ActionboxEnemy::staticClassID()) || entity == this->target)
     this->destroy( entity );
-  this->hitEntity = entity;
+//   this->hitEntity = entity;
  // dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
   this->deactivate();

branches/presentation/src/world_entities/projectiles/nadion_blast.cc

@@ -59 +59 @@
   this->angle     = 0;
 
+  this->setDamage(5);
+  
   //this->emitter = new DotEmitter(1000, 0, 0);
   this->emitter = new DotEmitter(50, 0, 0);

branches/presentation/src/world_entities/projectiles/plasma_pulse.cc

@@ -42 +42 @@
   this->setMinEnergy(2);
   this->setHealthMax(0);
+  this->setDamage(2);
   this->lifeSpan = 2.0;
   this->grid = new Billboard();