Changeset 4135 in orxonox.OLD for orxonox/trunk/src/orxonox.cc

Timestamp:

May 9, 2005, 11:01:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor

File:

• orxonox/trunk/src/orxonox.cc (modified) (6 diffs)

orxonox/trunk/src/orxonox.cc

@@ -48 +48 @@
 /**
    \brief create a new Orxonox
+
+   In this funcitons only global values are set. The game will not be started here.
 */
 Orxonox::Orxonox ()
@@ -56 +58 @@
   this->resources = NULL;
   this->localinput = NULL;
+
+  this->argc = 0;
+  this->argv = NULL;
 }
 
@@ -103 +108 @@
 int Orxonox::init (int argc, char** argv)
 {
+  this->argc = argc;
+  this->argv = argv;
   // parse command line
   // config file
@@ -132 +139 @@
   
   GraphicsEngine::getInstance();
-  
+
+  /*
+ int i;
+  for(i = 1; i < this->argc; ++i)
+    {
+      if (!strncmp (this->argv[i], "-r", 2))
+        {
+          char* tmp = strchr (argv[i], 'x');
+          //      GraphicsEngine::getInstance()->setResolution(atoi(argv[i]), atoi(tmp+1), 24);
+        }
+      else if (!strncmp(this->argv[i], "--resolution=", 13))
+        {
+        }
+    }
+  */
   return 0;
 }
@@ -339 +360 @@
 */
 int main(int argc, char** argv) 
-{  
-  
-  /* reading arguments 
-     
-     currently supported arguments are:
-     <no args>                   ::    just starts orxonox
-     --benchmark                 ::    start the benchmark without starting orxonox
-     
-     this is a preselection: it matches to one of the start* functions, the
-     finetuning is made in those functions.
-  */
-
-
+{ 
+
+  // here the pre-arguments are loaded, these are needed to go either to orxonx itself, Help, or Benchmark.
   int i;
   for(i = 1; i < argc; ++i)
     {
-      if(! strcmp( "--help", argv[i])) return startHelp(argc, argv);
-      else if(! strcmp( "--benchmark", argv[i])) return startBenchmarks();
-      else if(! strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
-      else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]);
+      if(! strcmp( "--help", argv[i]) || !strcmp("-h", argv[i])) return startHelp(argc, argv);
+      else if(!strcmp( "--benchmark", argv[i]) || !strcmp("-b", argv[i])) return startBenchmarks();
+      else if(!strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
+      //      else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]);
     }
 
@@ -376 +387 @@
     delete gui;
   }
-  PRINT(0)(" --benchmark:\t\t\tstarts the orxonox benchmark\n");
-  PRINT(0)(" --help: \t\t\tshows this help\n");
+  PRINT(0)(" -b|--benchmark:\t\tstarts the orxonox benchmark\n");
+  PRINT(0)(" -h|--help:\t\t\tshows this help\n");
 }