Changeset 5366 in orxonox.OLD for trunk/src/util

Timestamp:

Oct 12, 2005, 1:23:08 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more definitions of GLGui.
also a patch to the resource-manager

File:

• trunk/src/util/resource_manager.cc (modified) (4 diffs)

trunk/src/util/resource_manager.cc

@@ -217 +217 @@
 BaseObject* ResourceManager::load(const char* fileName, ResourcePriority prio, void* param1, void* param2, void* param3)
 {
+  if (fileName == NULL)
+    return NULL;
   ResourceType tmpType;
 #ifndef NO_MODEL
@@ -284 +286 @@
                             void* param1, void* param2, void* param3)
 {
+  if (fileName == NULL)
+    return NULL;
+
   // searching if the resource was loaded before.
   Resource* tmpResource = this->locateResourceByInfo(fileName, type, param1, param2, param3);
@@ -320 +325 @@
           else
             {
-              PRINTF(2)("Sorry, %s does not exist. Loading a cube-Model instead\n", fullName);
+              PRINTF(2)("File %s in %s does not exist. Loading a cube-Model instead\n", fileName, dataDir);
               tmpResource->pointer = ResourceManager::load("cube", PRIM, prio, &tmpResource->modelSize);
             }
@@ -461 +466 @@
 bool ResourceManager::unload(void* pointer, ResourcePriority prio)
 {
+  if (pointer == NULL)
+    return false;
   // if pointer is existent. and only one resource of this type exists.
   Resource* tmpResource = this->locateResourceByPointer(pointer);
-  if (tmpResource == NULL)
-    {
-      PRINTF(2)("Resource not Found %p\n", pointer);
-      return false;
-    }
-  else
+  if (tmpResource != NULL)
     return unload(tmpResource, prio);
+  else
+  {
+    PRINTF(2)("Resource not Found %p\n", pointer);
+    return false;
+  }
 }