Changeset 3983 in orxonox.OLD

Timestamp:

Apr 26, 2005, 3:33:06 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: resource now also gets loaded if the data-directory is not where it is supposed to be… this will be better in the future (i hope)

Location:

orxonox/trunk/src

Files:

• orxonox.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (1 diff)
• util/resource_manager.h (modified) (2 diffs)

orxonox/trunk/src/orxonox.cc

@@ -167 +167 @@
   PRINT(3)("initializing ResourceManager\n");
   resourceManager = ResourceManager::getInstance();
-  resourceManager->setDataDir("../data/");
+  if (!resourceManager->setDataDir("data/"))
+    if (!resourceManager->setDataDir("../data/"))
+      if (!resourceManager->setDataDir("../../data/"))
+        resourceManager->setDataDir("../../../data/");
   return 0;
   PRINT(3)("initializing TextEngine\n");

orxonox/trunk/src/util/resource_manager.cc

@@ -92 +92 @@
       this->dataDir = new char[strlen(dataDir)+1];
       strcpy(this->dataDir, dataDir);
+      return true;
     }
   else
     {
       PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", dataDir, this->dataDir);
+      return false;
     }
 }

orxonox/trunk/src/util/resource_manager.h

@@ -73 +73 @@
   bool unload(Resource* resource, ResourcePriority = RP_NO);
   bool unloadAllByPriority(ResourcePriority prio);
+
   void debug(void);
+
+  // utility functions of this class
+  static bool isDir(const char* directory);
+  static bool isFile(const char* directory);
 
  private:
@@ -87 +92 @@
   Resource* locateResourceByPointer(const void* pointer);
   
-  bool isDir(const char* directory);
-  bool isFile(const char* directory);
-
 };