Changeset 10345 in orxonox.OLD for branches/playability/src/world_entities/projectiles/spike.cc

Timestamp:

Jan 24, 2007, 6:13:17 PM (17 years ago)

Author:

marcscha

Message:

SegFault prevention hack in fast factory

File:

• branches/playability/src/world_entities/projectiles/spike.cc (modified) (5 diffs)

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

@@ -73 +73 @@
     //  delete Spike::explosionParticles;
     PRINTF(1)("Deleting Spike Particles\n");
+/*
+  if (Spike::objectList().exists(Spike::explosionParticles))
+      delete Spike::explosionParticles; */
     Spike::explosionParticles = NULL;
   }
@@ -85 +88 @@
   {
     Spike::explosionParticles = new SpriteParticles(1000);
-    Spike::explosionParticles->setName("BoltExplosionParticles");
+    Spike::explosionParticles->setName("SpikeExplosionParticles");
     Spike::explosionParticles->setLifeSpan(.5, .3);
     Spike::explosionParticles->setRadius(0.0, 10.0);
@@ -103 +106 @@
 {
   assert (Spike::explosionParticles != NULL);
-  Spike::explosionParticles->removeEmitter(this->emitter);
+  //Spike::explosionParticles->removeEmitter(this->emitter);
+  this->emitter->setSystem(NULL);
   this->lifeCycle = 0.0;
 
@@ -111 +115 @@
 }
 
-
+/*
 void Spike::collidesWith(WorldEntity* entity, const Vector& location)
 {
@@ -120 +124 @@
   dynamic_cast<SpaceShip*>(entity)->damage(this->getDamage(),0);
 //   this->deactivate();
-}
+}*/
 
 /**