Changeset 3348 for code/branches

Timestamp:

Jul 25, 2009, 1:14:30 AM (15 years ago)

Author:

rgrieder

Message:

Fixing a problem for the installed version on windows: Media path is not anymore a config value if you don't start orxonox from the build tree. But you can still temporarily change it or supply a new path as command line argument in any case.

File:

• code/branches/resource/src/core/Core.cc (modified) (2 diffs)

code/branches/resource/src/core/Core.cc

@@ -142 +142 @@
                 .callback(this, &CoreConfiguration::initializeRandomNumberGenerator);
 
-            SetConfigValue(mediaPathString_, mediaPath_.string())
-                .description("Relative path to the game data.")
-                .callback(this, &CoreConfiguration::mediaPathChanged);
+            // Only show this config value for development builds
+            if (Core::isDevelopmentRun())
+            {
+                SetConfigValue(mediaPathString_, mediaPath_.string())
+                    .description("Relative path to the game data.")
+                    .callback(this, &CoreConfiguration::mediaPathChanged);
+            }
         }
 
@@ -199 +203 @@
         void tsetMediaPath(const std::string& path)
         {
-            ModifyConfigValue(mediaPathString_, tset, path);
+            if (Core::isDevelopmentRun())
+            {
+                ModifyConfigValue(mediaPathString_, tset, path);
+            }
+            else
+            {
+                // Manual 'config' value without the file entry
+                mediaPathString_ = path;
+                this->mediaPathChanged();
+            }
         }