Changeset 5218 in orxonox.OLD

Timestamp:

Sep 22, 2005, 5:30:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more error-fixes… thanks Valgrind team

Location:

trunk/src

Files:

• lib/graphics/importer/model.cc (modified) (2 diffs)
• lib/graphics/spatial_separation/quadtree.cc (modified) (3 diffs)
• lib/math/curve.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• util/loading/load_param.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/model.cc

@@ -110 +110 @@
   if (this->listNumber != 0)
     glDeleteLists(this->listNumber, 1);
+
+  if (this->name[0] != '\0')
+    delete[] this->name;
 
   if (this->next !=NULL)
@@ -446 +449 @@
   if (this->groupCount != 0 && this->currentGroup->faceCount > 0)
     {
-      //      finalizeGroup(currentGroup);
+      // finalizeGroup(currentGroup);
       this->currentGroup = this->currentGroup->next = new ModelGroup;
     }

trunk/src/lib/graphics/spatial_separation/quadtree.cc

@@ -26 +26 @@
 using namespace std;
 
+#define QUADTREE_MATERIAL_COUNT       4
 
 /**
@@ -37 +38 @@
 
   /* initialize the materials for debug draw */
-  this->materials = new Material*[4];
-  for(int i = 0; i < 4; ++i)
+  this->materials = new Material*[QUADTREE_MATERIAL_COUNT];
+  for(int i = 0; i < QUADTREE_MATERIAL_COUNT; ++i)
   {
     materials[i] = new Material();
@@ -82 +83 @@
   // delete what has to be deleted here
   delete [] this->nodes;
+  if (this->materials != NULL)
+  {
+    for (unsigned int i = 0; i < QUADTREE_MATERIAL_COUNT; i++)
+      delete this->materials[i];
+    delete this->materials;
+  }
+
   delete this->rootNode;
   delete offset;

trunk/src/lib/math/curve.cc

@@ -19 +19 @@
      local-Time implementation
      NURBS
-     tList implementation
+     !!tList implementation!!
 
 */

trunk/src/story_entities/world.cc

@@ -146 +146 @@
   ResourceManager::getInstance()->unload(this->music);
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
+
+  delete[] this->path;
 }
 

trunk/src/util/loading/load_param.cc

@@ -154 +154 @@
     for(int i = 0; i < this->paramCount; i++)
     {
-      delete []this->defaultValues[i];
+      delete[] this->defaultValues[i];
     }
   }