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

Timestamp:

May 6, 2005, 8:02:26 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: now All options get loaded in new style (be aware, quiting only works with ESCAPE, not q, but of corse you can change this now in the GUI

File:

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

orxonox/trunk/src/orxonox.cc

@@ -32 +32 @@
 #include "data_tank.h"
 #include "command_node.h"
+#include "ini_parser.h"
 #include "game_loader.h"
 #include "graphics_engine.h"
@@ -173 +174 @@
 int Orxonox::initResources() 
 {
-  //  printf("Not yet implemented\n");
   PRINT(3)("initializing ResourceManager\n");
   resourceManager = ResourceManager::getInstance();
-  if (!resourceManager->setDataDir("../data/"))
-    {
-      PRINTF(1)("Data Could not be located\n");
+
+  // create parser
+  IniParser parser (DEFAULT_CONFIG_FILE);
+  if( parser.getSection (CONFIG_SECTION_DATA) == -1)
+    {
+      PRINTF(1)("Could not find Section %s in %s\n", CONFIG_SECTION_DATA, DEFAULT_CONFIG_FILE);
+      return -1;
+    }
+  char namebuf[256];
+  char valuebuf[256];
+  memset (namebuf, 0, 256);
+  memset (valuebuf, 0, 256);
+  
+  while( parser.nextVar (namebuf, valuebuf) != -1)
+    {
+      if (!strcmp(namebuf, CONFIG_NAME_DATADIR))
+        {
+          //  printf("Not yet implemented\n");
+          if (!resourceManager->setDataDir(valuebuf))
+            {
+              PRINTF(1)("Data Could not be located\n");
+              exit(-1);
+            }
+        }
+      
+      memset (namebuf, 0, 256);
+      memset (valuebuf, 0, 256);
+    }
+  
+  if (!resourceManager->checkDataDir(DEFAULT_DATA_DIR_CHECKFILE))
+    {
+      PRINTF(1)("The DataDirectory %s could not be verified\nPlease Change in File %s Section %s Entry %s to a suitable value\n",
+                resourceManager->getDataDir(),
+                DEFAULT_CONFIG_FILE,
+                CONFIG_SECTION_DATA,
+                CONFIG_NAME_DATADIR);
       exit(-1);
     }
+
 
   PRINT(3)("initializing TextEngine\n");