Changeset 7256 in orxonox.OLD for trunk/src/subprojects

Timestamp:

Mar 30, 2006, 11:45:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the preferences back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/preferences . -r7233:HEAD
no conflicts… nice work

File:

• trunk/src/subprojects/framework.cc (modified) (2 diffs)

trunk/src/subprojects/framework.cc

@@ -23 +23 @@
 #include "util/loading/resource_manager.h"
 #include "camera.h"
-#include "parser/ini_parser/ini_parser.h"
+#include "util/preferences.h"
 #include "globals.h"
 
@@ -30 +30 @@
 void Framework::init(void)
 {
-  // create parser
-  char* configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
-
-  IniParser iniParser (configFileName);
-  delete configFileName;
-
-  GraphicsEngine::getInstance()->initFromIniFile(&iniParser);
+  GraphicsEngine::getInstance()->initFromPreferences();
 
   LightManager::getInstance();
 
   const char* dataPath;
-  if ((dataPath = iniParser.getVar(CONFIG_NAME_DATADIR, CONFIG_SECTION_DATA))!= NULL)
+  if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_DATA, CONFIG_NAME_DATADIR, ""))!= NULL)
   {
     if (!ResourceManager::getInstance()->setDataDir(dataPath))