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

Timestamp:

Mar 21, 2006, 3:36:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/preferences: merged the old preferences here… some minor conflicts, hope it works

File:

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

branches/preferences/src/orxonox.cc

@@ -58 +58 @@
 
 #include "state.h"
-
+#include "lib/parser/preferences/cmd_line_prefs_reader.h"
 #include <string.h>
 
@@ -403 +403 @@
 int main(int argc, char** argv)
 {
-  int i;
+  CmdLinePrefsReader prefs(argc, argv);
+
+  /*int i;
   for(i = 1; i < argc; ++i)
   {
@@ -416 +418 @@
     else if(!strcmp( "--license", argv[i])  || !strcmp("-l", argv[i]))
       return PRINT(0)(ORXONOX_LICENSE_SHORT);
-  }
-
-  return startOrxonox(argc, argv, NULL, -1);
+}
+
+  return startOrxonox(argc, argv, NULL, -1);*/
+  return 0;
 }