Changeset 7248 in orxonox.OLD for branches/preferences/src/orxonox.cc

Timestamp:

Mar 24, 2006, 7:03:22 PM (18 years ago)

Author:

rennerc

Message:

removed some more iniParsers

File:

• branches/preferences/src/orxonox.cc (modified) (5 diffs)

branches/preferences/src/orxonox.cc

@@ -78 +78 @@
   this->setName("orxonox-main");
 
-  this->iniParser = NULL;
-
   this->argc = 0;
   this->argv = NULL;
@@ -115 +113 @@
   // output-buffer
   delete ShellBuffer::getInstance();
-
-  // orxonox class-stuff
-  delete this->iniParser;
 
   SDL_QuitSubSystem(SDL_INIT_TIMER);
@@ -176 +171 @@
   else
     this->configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
-  this->iniParser = new IniParser(this->configFileName);
+
   PRINTF(3)("Parsed Config File: '%s'\n", this->configFileName);
 }
@@ -261 +256 @@
   PRINT(3)("> Initializing input\n");
 
-  EventHandler::getInstance()->init(this->iniParser);
+  EventHandler::getInstance()->init();
   EventHandler::getInstance()->subscribe(GraphicsEngine::getInstance(), ES_ALL, EV_VIDEO_RESIZE);
 
@@ -300 +295 @@
   // init the resource manager
   std::string dataPath;
-  if ((dataPath = this->iniParser->getVar(CONFIG_NAME_DATADIR, CONFIG_SECTION_DATA))!= "")
+  if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_DATA, CONFIG_NAME_DATADIR, ""))!= "")
   {
     if (!ResourceManager::getInstance()->setDataDir(dataPath) &&