Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5512 in orxonox.OLD for trunk/src/world_entities


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/weapons/laser.cc

    r5511 r5512  
    3939Laser::Laser () : Projectile()
    4040{
    41   this->setClassID(CL_TEST_BULLET, "Laser");
     41  this->setClassID(CL_LASER, "Laser");
    4242
    4343  float modelSize = .3;
     
    6565
    6666  /* this is normaly done by World.cc by deleting the ParticleEngine */
    67   if (Laser::explosionParticles != NULL && ClassList::getList(CL_TEST_BULLET)->getSize() <= 1)
     67  if (Laser::explosionParticles != NULL && ClassList::getList(CL_LASER)->getSize() <= 1)
    6868  {
    69     if (ClassList::exists(Laser::explosionParticles, CL_PARTICLE_SYSTEM))
    70       delete Laser::explosionParticles;
     69    //if (ClassList::exists(Laser::explosionParticles, CL_PARTICLE_SYSTEM))
     70    //  delete Laser::explosionParticles;
     71    PRINTF(1)("Deleting Laser Particles\n");
    7172    Laser::explosionParticles = NULL;
    7273  }
  • trunk/src/world_entities/weapons/turret.cc

    r5511 r5512  
    2121
    2222#include "model.h"
    23 #include "p_node.h"
    2423
    2524#include "null_parent.h"
Note: See TracChangeset for help on using the changeset viewer.