Changeset 10345 in orxonox.OLD for branches/playability/src/world_entities/projectiles/spike_ball.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_ball.cc (modified) (5 diffs)

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

@@ -82 +82 @@
     //  delete SpikeBall::explosionParticles;
     PRINTF(1)("Deleting SpikeBall Particles\n");
+//    if (SpikeBall::objectList().exists(SpikeBall::explosionParticles))
+//      delete SpikeBall::explosionParticles;
     SpikeBall::explosionParticles = NULL;
   }
@@ -94 +96 @@
   {
     SpikeBall::explosionParticles = new SpriteParticles(1000);
-    SpikeBall::explosionParticles->setName("BoltExplosionParticles");
+    SpikeBall::explosionParticles->setName("SpikeBallExplosionParticles");
     SpikeBall::explosionParticles->setLifeSpan(.5, .3);
     SpikeBall::explosionParticles->setRadius(0.0, 10.0);
@@ -138 +140 @@
 {
   assert (SpikeBall::explosionParticles != NULL);
-  SpikeBall::explosionParticles->removeEmitter(this->emitter);
+  //SpikeBall::explosionParticles->removeEmitter(this->emitter);
+  this->emitter->setSystem(NULL);
   this->lifeCycle = 0.0;
 
@@ -146 +149 @@
 }
 
-
+/*
 void SpikeBall::collidesWith(WorldEntity* entity, const Vector& location)
 {
@@ -154 +157 @@
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage(this->getDamage(),0);
-}
+}*/