Changeset 6628 in orxonox.OLD

Timestamp:

Jan 20, 2006, 2:55:12 AM (18 years ago)

Author:

bensch

Message:

trunk: segfault-prevention, and minor cleanup

Location:

trunk/src

Files:

• lib/particles/sprite_particles.cc (modified) (1 diff)
• world_entities/projectiles/rocket.cc (modified) (2 diffs)

trunk/src/lib/particles/sprite_particles.cc

@@ -123 +123 @@
   Particle* drawPart = particles;
 
-  glDisable(GL_LIGHTING);
+  GLboolean checkLight = false;
+  glGetBooleanv(GL_LIGHTING, &checkLight);
+  if (checkLight == GL_TRUE)
+    glDisable(GL_LIGHTING);
   glMatrixMode(GL_MODELVIEW);
   glDepthMask(GL_FALSE);

trunk/src/world_entities/projectiles/rocket.cc

@@ -36 +36 @@
 Rocket::Rocket () : Projectile()
 {
-  this->setClassID(CL_TEST_BULLET, "Rocket");
+  this->setClassID(CL_ROCKET, "Rocket");
 
   float modelSize = .3;
@@ -61 +61 @@
   if (Rocket::trailParticles != NULL && ClassList::getList(CL_ROCKET)->size() <= 1)
   {
-    if (ClassList::exists(Rocket::trailParticles, CL_PARTICLE_SYSTEM))
-      delete Rocket::trailParticles;
+/*    if (ClassList::exists(Rocket::trailParticles, CL_PARTICLE_SYSTEM))
+      delete Rocket::trailParticles;*/
     Rocket::trailParticles = NULL;
   }
   if (Rocket::explosionParticles != NULL && ClassList::getList(CL_ROCKET)->size() <= 1)
   {
-    if (ClassList::exists(Rocket::explosionParticles, CL_PARTICLE_SYSTEM))
-      delete Rocket::explosionParticles;
+/*    if (ClassList::exists(Rocket::explosionParticles, CL_PARTICLE_SYSTEM))
+      delete Rocket::explosionParticles;*/
     Rocket::explosionParticles = NULL;
   }