Changeset 4167 in orxonox.OLD

Timestamp:

May 11, 2005, 3:14:03 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: check if file exists

File:

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

orxonox/trunk/src/util/resource_manager.cc

@@ -643 +643 @@
 /** 
     \param fileName the Name of the File to check
-    \returns The full name of the file, including the DataDir
+    \returns The full name of the file, including the DataDir, and NULL if the file does not exist
     IMPORTANT: this has to be deleted from the outside
 */
@@ -650 +650 @@
   char* retName = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(fileName)+1];
   sprintf(retName, "%s%s", ResourceManager::getInstance()->getDataDir(), fileName);
-  return retName;
+  if (ResourceManager::isFile(retName))
+    return retName;
+  else
+    {
+      delete retName;
+      return NULL;
+    }
 }