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

Timestamp:

May 9, 2005, 9:59:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: orxonox —help now shows something more usefull… still cleaning up the GUI

File:

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

orxonox/trunk/src/orxonox.cc

@@ -220 +220 @@
   PRINT(3)("initializing TextEngine\n");
   TextEngine::getInstance();
+
+  return 0;
 }
 
@@ -353 +355 @@
   for(i = 1; i < argc; ++i)
     {
-      if(! strcmp( "--help", argv[i])) return startHelp();
+      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;
@@ -364 +366 @@
 
 
-int startHelp()
+int startHelp(int argc, char** argv)
 {
   PRINT(0)("orxonox: starts the orxonox game - rules\n");
@@ -372 +374 @@
   PRINT(0)(" --help \tshows this menu\n");
   PRINT(0)(" --gui/-g \tDisplays the Gui on startup\n");
+  
+  {
+    Gui* gui = new Gui(argc, argv);
+    gui->printHelp();
+    delete gui;
+  }
 }
 
@@ -384 +392 @@
       if (ResourceManager::isFile("~/.orxonox/orxonox.lock"))
         ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
-      //      char* guiExec = new char[strlen(argv[0])+20];
-      //      sprintf(guiExec,"%sGui --gui", argv[0]);
+      
+      // starting the GUI
       Gui* gui = new Gui(argc, argv);
+      gui->startGui();
+
       if (! gui->startOrxonox)
         return 0;