Changeset 5512 in orxonox.OLD for trunk/src

Timestamp:

Nov 8, 2005, 11:54:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: removed a segfault, that came through the call to BaseObject::exists(); in Laser.h

Location:

trunk/src/world_entities/weapons

Files:

• laser.cc (modified) (2 diffs)
• turret.cc (modified) (1 diff)

trunk/src/world_entities/weapons/laser.cc

@@ -39 +39 @@
 Laser::Laser () : Projectile()
 {
-  this->setClassID(CL_TEST_BULLET, "Laser");
+  this->setClassID(CL_LASER, "Laser");
 
   float modelSize = .3;
@@ -65 +65 @@
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (Laser::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
+  if (Laser::explosionParticles != NULL && ClassList::getList(CL_LASER)->getSize() <= 1)
   {
-    if (ClassList::exists(Laser::explosionParticles, CL_PARTICLE_SYSTEM))
-      delete Laser::explosionParticles;
+    //if (ClassList::exists(Laser::explosionParticles, CL_PARTICLE_SYSTEM))
+    //  delete Laser::explosionParticles;
+    PRINTF(1)("Deleting Laser Particles\n");
     Laser::explosionParticles = NULL;
   }

trunk/src/world_entities/weapons/turret.cc

@@ -21 +21 @@
 
 #include "model.h"
-#include "p_node.h"
 
 #include "null_parent.h"