Changeset 5424 in orxonox.OLD for trunk/src

Timestamp:

Oct 22, 2005, 5:50:30 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Config-File can now also be directly in the Executable-directory

File:

• trunk/src/orxonox.cc (modified) (3 diffs)

trunk/src/orxonox.cc

@@ -162 +162 @@
 const char* Orxonox::getConfigFile ()
 {
-  this->configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
+  if (ResourceManager::isFile("orxonox.conf"))
+  {
+    this->configFileName = new char[strlen("orxonox.conf")+1];
+    strcpy(this->configFileName, "orxonox.conf");
+  }
+  else
+    this->configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
   this->iniParser = new IniParser(this->configFileName);
+  PRINTF(3)("Parsed Config File: '%s'\n", this->configFileName);
 }
 
@@ -275 +282 @@
               "  Please Change in File %s Section %s Entry %s to a suitable value\n",
               ResourceManager::getInstance()->getDataDir(),
-              DEFAULT_CONFIG_FILE,
+              this->configFileName,
               CONFIG_SECTION_DATA,
               CONFIG_NAME_DATADIR);
@@ -392 +399 @@
 {
   // checking for existence of the configuration-files, or if the lock file is still used
-  if (showGui ||
-      !ResourceManager::isFile(DEFAULT_CONFIG_FILE)
-#if DEBUG < 3
+  if (showGui || (!ResourceManager::isFile("./orxonox.conf") &&
+      !ResourceManager::isFile(DEFAULT_CONFIG_FILE))
+#if DEBUG < 3 // developers do not need to see the GUI, when orxonox fails
        || ResourceManager::isFile(DEFAULT_LOCK_FILE)
 #endif