Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4059 in orxonox.OLD


Ignore:
Timestamp:
May 5, 2005, 2:26:30 AM (20 years ago)
Author:
bensch
Message:

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

Location:
orxonox/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/lib/gui/gui/gui.cc

    r4058 r4059  
    117117#endif /* HAVE_CURL */
    118118
    119   // case start-with-gui.
    120   if (!access(exec->getConfigFile(), F_OK) &&
    121       static_cast<Option*>(orxonoxGUI->findWidgetByName("Always Show this Menu", 0))->value == 0)
    122     GuiExec::startOrxonox(NULL, exec);
    123   else
    124     {
    125       mainloopGUI();
    126     }
    127 
     119  mainloopGUI();
    128120}
    129121
  • orxonox/trunk/src/orxonox.cc

    r4057 r4059  
    4949Orxonox::Orxonox ()
    5050{
    51   pause = false;
     51  this->pause = false;
     52
    5253  this->world = NULL;
    5354  this->resources = NULL;
     
    292293
    293294
     295bool showGui = false;
    294296
    295297/**
     
    317319      if(! strcmp( "--help", argv[i])) return startHelp();
    318320      else if(! strcmp( "--benchmark", argv[i])) return startBenchmarks();
    319      
     321      else if(! strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
    320322      else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]);
    321323    }
     
    333335  PRINT(0)(" --benchmark\tstarts the orxonox benchmark\n");
    334336  PRINT(0)(" --help \tshows this menu\n");
     337  PRINT(0)(" --gui/-g \tDisplays the Gui on startup\n");
    335338}
    336339
     
    339342{
    340343  // checking for existence of the configuration-files
    341   if (!ResourceManager::isFile("~/.orxonox/orxonox.conf") || ResourceManager::isFile("~/.orxonox/orxonox.lock"))
     344  if (showGui ||
     345      !ResourceManager::isFile("~/.orxonox/orxonox.conf") ||
     346      ResourceManager::isFile("~/.orxonox/orxonox.lock"))
    342347    {
    343348      if (ResourceManager::isFile("~/.orxonox/orxonox.lock"))
Note: See TracChangeset for help on using the changeset viewer.