Changeset 4830 in orxonox.OLD for orxonox/trunk/src/orxonox.cc

Timestamp:

Jul 11, 2005, 5:43:37 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented aim

File:

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

orxonox/trunk/src/orxonox.cc

@@ -71 +71 @@
   this->argv = NULL;
 
+  this->configFileName = NULL;
+
 }
 
@@ -79 +81 @@
 {
   delete this->iniParser;
+  delete this->configFileName;
 
   delete GraphicsEngine::getInstance(); // deleting the Graphics
@@ -116 +119 @@
  * it's path and name into configfilename
 */
-const char* Orxonox::getConfigFile (int argc, char** argv)
-{
+const char* Orxonox::getConfigFile ()
+{
+  this->configFileName = new char[strlen(DEFAULT_CONFIG_FILE)];
   strcpy (this->configFileName, DEFAULT_CONFIG_FILE);
   this->iniParser = new IniParser(this->configFileName);
@@ -133 +137 @@
 
   // initialize the Config-file
-  this->getConfigFile(argc, argv);
+  this->getConfigFile();
 
 
@@ -351 +355 @@
 int startOrxonox(int argc, char** argv)
 {
-  // checking for existence of the configuration-files
+  // checking for existence of the configuration-files, or if the lock file is still used
   if (showGui ||
       !ResourceManager::isFile(DEFAULT_CONFIG_FILE) ||