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

Timestamp:

Jun 23, 2006, 5:08:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fallback test for ORXONOX-data-directory

File:

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

trunk/src/orxonox.cc

@@ -31 +31 @@
 
 #include "gui/qt/qt_gui.h"
+#include "gui/qt/qt_gui_datadir_fallback.h"
 
 #include "parser/ini_parser/ini_parser.h"
@@ -227 +228 @@
   // initialize everything
   SDL_Init(0);
+  if( initVideo() == -1)
+    return -1;
   if( initResources () == -1)
-    return -1;
-  if( initVideo() == -1)
     return -1;
   if( initSound() == -1)
@@ -286 +287 @@
   PRINT(3)("> Initializing input\n");
 
-  EventHandler::getInstance()->
   EventHandler::getInstance()->init();
   EventHandler::getInstance()->subscribe(GraphicsEngine::getInstance(), ES_ALL, EV_VIDEO_RESIZE);
@@ -336 +336 @@
   }
 
-  if (!ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
-  {
+
+  while (!ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
+  {
+
     PRINTF(1)("The DataDirectory %s could not be verified\n\nh" \
               "!!!  Please Change in File %s Section %s Entry %s to a suitable value !!!\n",
@@ -344 +346 @@
               CONFIG_SECTION_GENERAL,
               CONFIG_NAME_DATADIR );
-    OrxGui::Gui* gui = new OrxGui::QtGui(argc, argv);
+    OrxGui::Gui* gui = new OrxGui::QtGuiDataDirFallback(argc, argv);
     gui->startGui();
     delete gui;
-    exit(-1);
-  }
+    ResourceManager::getInstance()->setDataDir(Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""));
+
+  }
+
+
   //! @todo this is a hack and should be loadable
   std::string imageDir = ResourceManager::getInstance()->getFullName("maps");
@@ -356 +361 @@
 
   //  DynamicLoader::loadDyLib("libtest.so");
+  return 0;
+}
+
+/**
+ * initializes miscelaneous features
+ * @return -1 on failure
+ */
+int Orxonox::initMisc()
+{
+  OrxShell::ShellBuffer::getInstance();
 
   // start the collision detection engine
   CDEngine::getInstance();
-  return 0;
-}
-
-/**
- * initializes miscelaneous features
- * @return -1 on failure
- */
-int Orxonox::initMisc()
-{
-  OrxShell::ShellBuffer::getInstance();
+
   return 0;
 }