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

Timestamp:

Dec 20, 2006, 12:31:27 AM (18 years ago)

Author:

marcscha

Message:

Last update, collision working again. SEGFAULT problems

Location:

branches/playability/src/world_entities/projectiles

Files:

• lbolt.cc (modified) (1 diff)
• mbolt.cc (modified) (5 diffs)
• mbolt.h (modified) (1 diff)
• swarm_projectile.cc (modified) (1 diff)

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

@@ -47 +47 @@
   this->setMinEnergy(1);
   this->setHealthMax(0);
-  this->lifeSpan = 5.0;
+  this->lifeSpan = 2.0;
 
   this->emitter = new DotEmitter(100, 5, M_2_PI);

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

@@ -53 +53 @@
   this->setMinEnergy(4);
   this->setHealthMax(0);
-  this->lifeSpan = 5.0;
+  this->lifeSpan = 3.0;
   this->angle     = 0;
 
@@ -137 +137 @@
   this->lifeCycle = 0.0;
 
-  //this->toList(OM_NULL);
   this->toList(OM_DEAD);
-  //this->removeNode();
+  this->removeNode();
   MBolt::fastFactory->kill(this);
 }
@@ -146 +145 @@
 void MBolt::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  PRINTF(0)("MBolt collides pretest\n");
-
-  if( entity == NULL)
+
+  if (this->hitEntity != entity)
+    this->destroy( entity );
+  this->hitEntity = entity;
+  dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
+  this->destroy(this);
+  
+  return;
+
+  if( entity == NULL || dynamic_cast<SpaceShip*>(entity) == NULL)
     return;
 
-  PRINTF(0)("MBolt collides\n");
   dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
   //entity->destroy(this);
@@ -179 +184 @@
 void MBolt::destroy (WorldEntity* killer)
 {
+  //this->deactivate();
   Projectile::destroy( killer );
   PRINTF(5)("DESTROY MBolt\n");
@@ -211 +217 @@
 
 }
-

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

@@ -35 +35 @@
     virtual void draw () const;
 
-
   private:
     static FastFactory*               fastFactory;

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

@@ -136 +136 @@
     this->destroy( entity );
   this->hitEntity = entity;
-  dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
+  //dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
   this->destroy(this);
 }