Changeset 5302 in orxonox.OLD for trunk/src

Timestamp:

Oct 7, 2005, 2:28:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed bug in SkyShphere, doubly deleted Model

Location:

trunk/src

Files:

• lib/graphics/importer/material.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (2 diffs)
• world_entities/satellite.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/weapons/weapon.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

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

@@ -269 +269 @@
 {
   PRINTF(4)("setting Diffuse Map %s\n", dMap);
-  if (this->diffuseTexture)
+  if (this->diffuseTexture != NULL)
     ResourceManager::getInstance()->unload(this->diffuseTexture);
 

trunk/src/util/resource_manager.cc

@@ -399 +399 @@
   // if pointer is existent. and only one resource of this type exists.
   Resource* tmpResource = this->locateResourceByPointer(pointer);
-  if (!tmpResource)
+  if (tmpResource == NULL)
     {
       PRINTF(2)("Resource not Found %p\n", pointer);
@@ -460 +460 @@
           delete[] resource->name;
           this->resourceList->remove(resource);
+          delete resource;
         }
       else

trunk/src/world_entities/satellite.cc

@@ -44 +44 @@
 Satellite::~Satellite ()
 {
-  // if( collisioncluster != NULL) delete collisioncluster;
-  if (this->model)
-    ResourceManager::getInstance()->unload(this->model);
 }
 

trunk/src/world_entities/skybox.cc

@@ -103 +103 @@
   delete []this->material;
   delete this->model;
+  this->model = NULL; //< so that WorldEntity does not try to delete it again.
 }
 

trunk/src/world_entities/weapons/weapon.cc

@@ -55 +55 @@
       delete this->animation[i];
   for (int i = 0; i < WA_ACTION_COUNT; i++)
-    if (this->soundBuffers[i])
+    if (this->soundBuffers[i] != NULL && ClassList::exists(this->soundBuffers[i], CL_SOUND_BUFFER))
       ResourceManager::getInstance()->unload(this->soundBuffers[i]);
 

trunk/src/world_entities/world_entity.cc

@@ -55 +55 @@
 {
   // if( collisioncluster != NULL) delete collisioncluster;
-  if (this->model)
+  if (likely(this->model != NULL))
     ResourceManager::getInstance()->unload(this->model);
-  if( this->obbTree)
+  if( this->obbTree != NULL)
     delete this->obbTree;
 }