Changeset 7123 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Feb 11, 2006, 8:57:26 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: some cleanup before the new tag

1. BaseObject isA was wrong… every subclass was detected as any other subclass
2. Classes get unloaded again as they should
3. some minor fixes (Material* → Material) and some other cleanups

File:

• trunk/src/world_entities/world_entity.cc (modified) (1 diff)

trunk/src/world_entities/world_entity.cc

@@ -190 +190 @@
   {
     Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->models[modelNumber]);
-    //     if (resource != NULL)
-    ResourceManager::getInstance()->unload(resource, RP_LEVEL);
-  }
-  else
-    delete this->models[modelNumber];
+    if (resource != NULL)
+      ResourceManager::getInstance()->unload(resource, RP_LEVEL);
+    else
+    {
+      PRINTF(4)("Forcing model deletion\n");
+      delete this->models[modelNumber];
+    }
+  }
 
   this->models[modelNumber] = model;