Changeset 4044 in orxonox.OLD for orxonox/branches/guiMerge/src/orxonox.cc

Timestamp:

May 4, 2005, 7:17:38 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/guiMerge: merged the Gui into the orxonox-binary, but it does not finish nicely (yet)

File:

• orxonox/branches/guiMerge/src/orxonox.cc (modified) (2 diffs)

orxonox/branches/guiMerge/src/orxonox.cc

@@ -26 +26 @@
 
 #include "orxonox.h"
+
+#include "orxonox_gui.h"
 
 #include "world.h"
@@ -337 +339 @@
       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);
+      delete gui;
+      //      delete guiExec;
+      //      return 0;
     }