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

Timestamp:

May 4, 2005, 1:57:55 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: orxonox now starts the Gui by default, and also if orxonox shuts down unexpected

File:

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

orxonox/trunk/src/orxonox.cc

@@ -37 +37 @@
 
 #include <string.h>
+
 int verbose = 4;
 
@@ -46 +47 @@
 Orxonox::Orxonox ()
 {
+  ResourceManager::touchFile("~/.orxonox/orxonox.lock");
+
   pause = false;
 }
@@ -61 +64 @@
   delete ResourceManager::getInstance(); // deletes the Resource Manager
   delete TextEngine::getInstance();
+
+  ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
 }
 
@@ -302 +307 @@
 
   int i;
-  for(i = 0; i < argc; ++i)
+  for(i = 1; i < argc; ++i)
     {
       if(! strcmp( "--help", argv[i])) return startHelp();
       else if(! strcmp( "--benchmark", argv[i])) return startBenchmarks();
+      
+      else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]);
     }
 
-  PRINTF(2)("Orxonox does not understand the arguments");
   return startOrxonox(argc, argv);
 }
@@ -316 +322 @@
 int startHelp()
 {
-  printf("orxonox: starts the orxonox game - rules\n");
-  printf("usage: orxonox [arg]\n\n");
-  printf("valid options:\n");
-  printf(" --benchmark\tstarts the orxonox benchmark\n");
-  printf(" --help \tshows this menu\n");
+  PRINT(0)("orxonox: starts the orxonox game - rules\n");
+  PRINT(0)("usage: orxonox [arg]\n\n");
+  PRINT(0)("valid options:\n");
+  PRINT(0)(" --benchmark\tstarts the orxonox benchmark\n");
+  PRINT(0)(" --help \tshows this menu\n");
 }
 
@@ -326 +332 @@
 int startOrxonox(int argc, char** argv)
 {
-  printf(">>> Starting Orxonox <<<\n");
+  // checking for existence of the configuration-files
+  if (!ResourceManager::isFile("~/.orxonox/orxonox.conf") || ResourceManager::isFile("~/.orxonox/orxonox.lock"))
+    {
+      if (ResourceManager::isFile("~/.orxonox/orxonox.lock"))
+        ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
+      if (system("./orxonoxGui --gui") == -1)
+        system ("orxonoxGui --gui");
+      return 0;
+    }
+  
+  PRINT(0)(">>> Starting Orxonox <<<\n");
   Orxonox *orx = Orxonox::getInstance();
   
   if((*orx).init(argc, argv) == -1)
     {
-      printf("! Orxonox initialization failed\n");
+      PRINTF(1)("! Orxonox initialization failed\n");
       return -1;
     }