Changeset 9795 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/resource.cc

Timestamp:

Sep 23, 2006, 6:52:01 PM (18 years ago)

Author:

bensch

Message:

the new ResourceManger should work with the global settings

File:

• branches/new_class_id/src/lib/util/loading/resource.cc (modified) (2 diffs)

branches/new_class_id/src/lib/util/loading/resource.cc

@@ -50 +50 @@
 
   std::string locatedFile;
-  locatedFile = locateFileInSubDir(Directory("/home/bensch/svn/orxonox/data/"), fileName);
+  locatedFile = locateFileInSubDir(NewResourceManager::getInstance()->mainGlobalPath(), fileName);
   if (!locatedFile.empty())
   {
@@ -56 +56 @@
     return locatedFile;
   }
-  return std::string("/home/bensch/svn/orxonox/data/") + fileName;
+
+  return (NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
 }