Changeset 9796 in orxonox.OLD for branches/new_class_id

Timestamp:

Sep 23, 2006, 7:15:25 PM (18 years ago)

Author:

bensch

Message:

switched to checks of the NewResourceManager in orxonox.cc

File:

• branches/new_class_id/src/orxonox.cc (modified) (2 diffs)

branches/new_class_id/src/orxonox.cc

@@ -341 +341 @@
   if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""))!= "")
   {
-    if (!ResourceManager::getInstance()->setDataDir(dataPath) &&
-        !ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
+    NewResourceManager::getInstance()->setMainGlobalPath(dataPath) ;
+    if(!NewResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
     {
       PRINTF(1)("Data Could not be located in %s\n", dataPath.c_str());
     }
   }
-
-
-  while (!ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
+  while (!NewResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
   {
 
     PRINTF(1)("The DataDirectory %s could not be verified\n\nh" \
               "!!!  Please Change in File %s Section %s Entry %s to a suitable value !!!\n",
-              ResourceManager::getInstance()->getDataDir().c_str(),
+              NewResourceManager::getInstance()->mainGlobalPath().c_str(),
               this->configFileName.c_str(),
               CONFIG_SECTION_GENERAL,
@@ -363 +361 @@
       return(-1);
     delete gui;
-    ResourceManager::getInstance()->setDataDir(Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""));
-  }
-
-  NewResourceManager::getInstance()->setMainGlobalPath(dataPath);
-  if (!NewResourceManager::getInstance()->checkFileInMainPath(File(DEFAULT_DATA_DIR_CHECKFILE)))
-    exit(-1);
-
+    NewResourceManager::getInstance()->setMainGlobalPath(Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""));
+  }
+
+  ResourceManager::getInstance()->setDataDir(dataPath);
 
   //! @todo this is a hack and should be loadable