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

Timestamp:

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

Author:

bensch

Message:

orxonox/branches/physics: segfault-prevention

Location:

orxonox/branches/physics/src/lib

Files:

• graphics/particles/particle_system.cc (modified) (2 diffs)
• gui/gui/gui_gtk.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);
     }

orxonox/branches/physics/src/lib/gui/gui/gui_gtk.cc

@@ -1419 +1419 @@
 {
   MenuItem* tmpItem = this->firstItem;
-  for (int i = 0; i<this->value; i++)
-    tmpItem = tmpItem->next;
-      
-  return tmpItem->name;
+  for (int i = 0; i < this->value; i++)
+    if (tmpItem)
+      tmpItem = tmpItem->next;
+    else
+      break;
+  if (tmpItem)
+    {
+      char* tmpName = new char[strlen(tmpItem->name)+1];
+      strcpy(tmpName, tmpItem->name);
+      return tmpName;
+    }
+  else 
+    return NULL;
 }
 
@@ -1503 +1512 @@
 
 #endif /* HAVE_GTK2 */
-  PRINT(5)("%s set to: %d\n", this->title, this->value);
+  PRINT(1)("%s set to: %d\n", this->title, this->value);
 }