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

Timestamp:

May 5, 2005, 1:32:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the guiMerge-branche back into the trunk
merged with command:
svn merge -r 4043:HEAD guiMerge/ ../trunk/
no conflicts, only updates and moves

File:

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

orxonox/trunk/src/orxonox.cc

@@ -22 +22 @@
    main-programmer: Patrick Boenzli
    co-programmer: Christian Meyer
-   co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine
+   co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine/GUI
 */
 
 #include "orxonox.h"
+
+#include "gui.h"
 
 #include "world.h"
@@ -48 +50 @@
 {
   pause = false;
+  this->world = NULL;
+  this->resources = NULL;
+  this->localinput = NULL;
 }
 
@@ -55 +60 @@
 Orxonox::~Orxonox () 
 {
+  int i =0;
   Orxonox::singletonRef = NULL;
   if( world != NULL) delete world;
-  if( localinput != NULL) delete world;
+  if( localinput != NULL) delete localinput;
   if( resources != NULL) delete resources;
   delete GraphicsEngine::getInstance(); // deleting the Graphics
@@ -172 +178 @@
     {
       PRINTF(1)("Data Could not be located\n");
-      exit( -1);
+      exit(-1);
     }
 
@@ -337 +343 @@
       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]);
-      system(guiExec);
-      delete guiExec;
-      return 0;
+      //      char* guiExec = new char[strlen(argv[0])+20];
+      //      sprintf(guiExec,"%sGui --gui", argv[0]);
+      OrxonoxGui* gui = new OrxonoxGui(argc, argv);
+      if (! gui->startOrxonox)
+        return 0;
+      
+      delete gui;
+      //      delete guiExec;
+      //      return 0;
     }