Changeset 4336 in orxonox.OLD for orxonox/branches/physics/src/lib/graphics/particles

Timestamp:

May 27, 2005, 8:22:54 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: segfault-prevention

File:

• orxonox/branches/physics/src/lib/graphics/particles/particle_system.cc (modified) (2 diffs)

orxonox/branches/physics/src/lib/graphics/particles/particle_system.cc

@@ -42 +42 @@
 ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type)
 {
-   this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
+  this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
   this->material = NULL;
   this->name = NULL;
@@ -123 +123 @@
 
   //  glID[0] = glGenLists(count);
-  if (material)
-    delete material;
+  if (this->material)
+    delete this->material;
   material = NULL;
 
-  if (particleType == PARTICLE_SPRITE)
-    {
-      material = new Material("transperencyMap");
-      material->setDiffuseMap("pictures/radialTransparency.png");
+  if (this->particleType == PARTICLE_SPRITE)
+    {
+      this->material = new Material("transperencyMap");
+      this->material->setDiffuseMap("pictures/radialTransparency.png");
       //  material->setTransparency(.5);
     }