Changeset 546 for code/branches/FICN/src/orxonox/orxonox.cc

Timestamp:

Dec 16, 2007, 10:19:03 PM (18 years ago)

Author:

bknecht

Message:

suggestion for solution of WinMain problem

File:

• code/branches/FICN/src/orxonox/orxonox.cc (modified) (4 diffs)

code/branches/FICN/src/orxonox/orxonox.cc

@@ -193 +193 @@
   {
     ogre_ = new GraphicsEngine();
+    dataPath_ = "";
   }
 
@@ -217 +218 @@
     ArgReader ar = ArgReader(argc, argv);
     ar.checkArgument("mode", mode, false);
-//     ar.checkArgument("data-path", path, true);
+    ar.checkArgument("data", this->dataPath_, false);
     if(ar.errorHandling()) die();
 
@@ -354 +355 @@
     cf.load(macBundlePath() + "/Contents/Resources/resources.cfg");
 #else
-    cf.load("resources.cfg");
+    cf.load(dataPath_ + "resources.cfg");
 #endif
 
@@ -378 +379 @@
   void Orxonox::setupRenderSystem()
   {
-    if (!root_->restoreConfig() && !root_->showConfigDialog())
+    if (/*!root_->restoreConfig() &&*/ !root_->showConfigDialog())
       throw Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
   }