Changeset 7246 in orxonox.OLD

Timestamp:

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

Author:

rennerc

Message:

prefs are loaded from ini and commandline

Location:

branches/preferences/src

Files:

• lib/parser/cmdline_parser/cmdline_parser.cc (modified) (2 diffs)
• orxonox.cc (modified) (2 diffs)

branches/preferences/src/lib/parser/cmdline_parser/cmdline_parser.cc

@@ -71 +71 @@
       ar.erase( 0, ar.find("=")+1);
       
-      PRINTF(0)("'%s' '%s'\n", op.c_str(), ar.c_str());
+      //PRINTF(0)("'%s' '%s'\n", op.c_str(), ar.c_str());
       args.push_back( op );
       args.push_back( ar );
@@ -146 +146 @@
         std::string lo = entry.longOption;
         lo.erase( lo.length()-1, 1 );
-        PRINTF(0)("%s %s\n", arg.c_str(), lo.c_str());
+        //PRINTF(0)("%s %s\n", arg.c_str(), lo.c_str());
         return arg.find( lo ) == 0;
       }

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;