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

Timestamp:

Mar 24, 2006, 5:15:23 PM (18 years ago)

Author:

rennerc

Message:

prefs are loaded from ini and commandline

File:

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

branches/preferences/src/orxonox.cc

@@ -59 +59 @@
 #include "state.h"
 #include "lib/parser/preferences/cmd_line_prefs_reader.h"
+#include "lib/parser/preferences/ini_file_prefs_reader.h"
 #include <string.h>
 
@@ -404 +405 @@
 {
   CmdLinePrefsReader prefs;
+  
+  IniFilePrefsReader ini(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE));
+  
   prefs.parse(argc, argv);
-
- // assert(false);
+  
+  Preferences::getInstance()->debug();
+
+  assert(false);
   
   int i;