Changeset 4059 in orxonox.OLD

Timestamp:

May 5, 2005, 2:26:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: gui now gets called through -g/—gui

Location:

orxonox/trunk/src

Files:

• lib/gui/gui/gui.cc (modified) (1 diff)
• orxonox.cc (modified) (5 diffs)

orxonox/trunk/src/lib/gui/gui/gui.cc

@@ -117 +117 @@
 #endif /* HAVE_CURL */
 
-  // case start-with-gui.
-  if (!access(exec->getConfigFile(), F_OK) && 
-      static_cast<Option*>(orxonoxGUI->findWidgetByName("Always Show this Menu", 0))->value == 0)
-    GuiExec::startOrxonox(NULL, exec);
-  else
-    {
-      mainloopGUI();
-    }
-
+  mainloopGUI();
 }
 

orxonox/trunk/src/orxonox.cc

@@ -49 +49 @@
 Orxonox::Orxonox ()
 {
-  pause = false;
+  this->pause = false;
+
   this->world = NULL;
   this->resources = NULL;
@@ -292 +293 @@
 
 
+bool showGui = false;
 
 /**
@@ -317 +319 @@
       if(! strcmp( "--help", argv[i])) return startHelp();
       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]);
     }
@@ -333 +335 @@
   PRINT(0)(" --benchmark\tstarts the orxonox benchmark\n");
   PRINT(0)(" --help \tshows this menu\n");
+  PRINT(0)(" --gui/-g \tDisplays the Gui on startup\n");
 }
 
@@ -339 +342 @@
 {
   // checking for existence of the configuration-files
-  if (!ResourceManager::isFile("~/.orxonox/orxonox.conf") || ResourceManager::isFile("~/.orxonox/orxonox.lock"))
+  if (showGui ||
+      !ResourceManager::isFile("~/.orxonox/orxonox.conf") ||
+      ResourceManager::isFile("~/.orxonox/orxonox.lock"))
     {
       if (ResourceManager::isFile("~/.orxonox/orxonox.lock"))