Changeset 5480 in orxonox.OLD for trunk/src/util/loading/resource_manager.cc

Timestamp:

Nov 3, 2005, 9:08:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better check for data-dir

File:

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

trunk/src/util/loading/resource_manager.cc

@@ -60 +60 @@
   this->dataDir = new char[3];
   strcpy(this->dataDir, "./");
-  this->setDataDir("./data");
+  this->tryDataDir("./data");
   this->imageDirs = new tList<char>;
   this->resourceList = new tList<Resource>;
@@ -99 +99 @@
  *  sets the data main directory
  * @param dataDir the DataDirectory.
-*/
+ */
 bool ResourceManager::setDataDir(const char* dataDir)
 {
   char* realDir = ResourceManager::homeDirCheck(dataDir);
   if (isDir(realDir))
-    {
-      delete[] this->dataDir;
-      if (dataDir[strlen(dataDir)-1] == '/' || dataDir[strlen(dataDir)-1] == '\\')
-      {
-        this->dataDir = new char[strlen(realDir)+1];
-        strcpy(this->dataDir, realDir);
-      }
-      else
-      {
-        this->dataDir = new char[strlen(realDir)+2];
-        strcpy(this->dataDir, realDir);
-        this->dataDir[strlen(realDir)] = '/';
-        this->dataDir[strlen(realDir)+1] = '\0';
-      }
-      delete[] realDir;
-      return true;
-    }
-  else
-    {
-      PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", realDir, this->dataDir);
-      delete[] realDir;
-      return false;
-    }
-}
-
-/**
- *  checks for the DataDirectory, by looking if
- * @param fileInside is inisde??
-*/
-bool ResourceManager::checkDataDir(const char* fileInside)
+  {
+    delete[] this->dataDir;
+    if (dataDir[strlen(dataDir)-1] == '/' || dataDir[strlen(dataDir)-1] == '\\')
+    {
+      this->dataDir = new char[strlen(realDir)+1];
+      strcpy(this->dataDir, realDir);
+    }
+    else
+    {
+      this->dataDir = new char[strlen(realDir)+2];
+      strcpy(this->dataDir, realDir);
+      this->dataDir[strlen(realDir)] = '/';
+      this->dataDir[strlen(realDir)+1] = '\0';
+    }
+    delete[] realDir;
+    return true;
+  }
+  else
+  {
+    PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", realDir, this->dataDir);
+    delete[] realDir;
+    return false;
+  }
+}
+
+/**
+ * sets the data main directory
+ * @param dataDir the DataDirectory.
+ *
+ * this is essentially the same as setDataDir, but it ommits the error-message
+ */
+bool ResourceManager::tryDataDir(const char* dataDir)
+{
+  char* realDir = ResourceManager::homeDirCheck(dataDir);
+  if (isDir(realDir))
+  {
+    delete[] this->dataDir;
+    if (dataDir[strlen(dataDir)-1] == '/' || dataDir[strlen(dataDir)-1] == '\\')
+    {
+      this->dataDir = new char[strlen(realDir)+1];
+      strcpy(this->dataDir, realDir);
+    }
+    else
+    {
+      this->dataDir = new char[strlen(realDir)+2];
+      strcpy(this->dataDir, realDir);
+      this->dataDir[strlen(realDir)] = '/';
+      this->dataDir[strlen(realDir)+1] = '\0';
+    }
+    delete[] realDir;
+    return true;
+  }
+}
+
+
+
+/**
+ * checks for the DataDirectory, by looking if
+ * @param fileInside is iniside of the given directory.
+*/
+bool ResourceManager::verifyDataDir(const char* fileInside)
 {
   bool retVal;