- Timestamp:
- Jan 20, 2006, 2:55:12 AM (19 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/particles/sprite_particles.cc
r6626 r6628 123 123 Particle* drawPart = particles; 124 124 125 glDisable(GL_LIGHTING); 125 GLboolean checkLight = false; 126 glGetBooleanv(GL_LIGHTING, &checkLight); 127 if (checkLight == GL_TRUE) 128 glDisable(GL_LIGHTING); 126 129 glMatrixMode(GL_MODELVIEW); 127 130 glDepthMask(GL_FALSE); -
trunk/src/world_entities/projectiles/rocket.cc
r6627 r6628 36 36 Rocket::Rocket () : Projectile() 37 37 { 38 this->setClassID(CL_ TEST_BULLET, "Rocket");38 this->setClassID(CL_ROCKET, "Rocket"); 39 39 40 40 float modelSize = .3; … … 61 61 if (Rocket::trailParticles != NULL && ClassList::getList(CL_ROCKET)->size() <= 1) 62 62 { 63 if (ClassList::exists(Rocket::trailParticles, CL_PARTICLE_SYSTEM))64 delete Rocket::trailParticles; 63 /* if (ClassList::exists(Rocket::trailParticles, CL_PARTICLE_SYSTEM)) 64 delete Rocket::trailParticles;*/ 65 65 Rocket::trailParticles = NULL; 66 66 } 67 67 if (Rocket::explosionParticles != NULL && ClassList::getList(CL_ROCKET)->size() <= 1) 68 68 { 69 if (ClassList::exists(Rocket::explosionParticles, CL_PARTICLE_SYSTEM))70 delete Rocket::explosionParticles; 69 /* if (ClassList::exists(Rocket::explosionParticles, CL_PARTICLE_SYSTEM)) 70 delete Rocket::explosionParticles;*/ 71 71 Rocket::explosionParticles = NULL; 72 72 }
Note: See TracChangeset
for help on using the changeset viewer.