diff --git a/ext/ghoul b/ext/ghoul index 7cb0200c68..7ee41ec880 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 7cb0200c683a9bc22d7168309d0cfbe305a5fd3e +Subproject commit 7ee41ec88007ca67bdce39d1b9dd7378c28db1ba diff --git a/scripts/DefaultConfig.lua b/scripts/DefaultConfig.lua index 52b8da7ad9..3e0738115a 100644 --- a/scripts/DefaultConfig.lua +++ b/scripts/DefaultConfig.lua @@ -1,5 +1,3 @@ - -config = { level1_string = "music1", level1_integer = 2332, diff --git a/scripts/ExtraConfig.lua b/scripts/ExtraConfig.lua deleted file mode 100644 index 23d1dc5203..0000000000 --- a/scripts/ExtraConfig.lua +++ /dev/null @@ -1,14 +0,0 @@ - - -configuration = -{ - level1_string = "music2", - level1_lyrics = "This is not, the greatest lyrics in the world. This is just a tribute", - level1_secrets = - { - secret_stuff1 = "Password", - secret_stuff2 = "123456", - }, - level2_double = 4.3 - -} \ No newline at end of file diff --git a/scripts/ExtraConfigScript.lua b/scripts/ExtraConfigScript.lua new file mode 100644 index 0000000000..00eeec55f1 --- /dev/null +++ b/scripts/ExtraConfigScript.lua @@ -0,0 +1,15 @@ +musicname = "music2" +lyrics = "This is not, the greatest lyrics in the world. This is just a tribute" + +configuration = +{ + level1_string = musicname, + level1_lyrics = lyrics, + level1_secrets = + { + secret_stuff1 = "Password", + secret_stuff2 = "123456", + }, + level2_double = 4.3 + +} \ No newline at end of file diff --git a/src/openspaceengine.cpp b/src/openspaceengine.cpp index ca51279e2a..6ae3ed6667 100644 --- a/src/openspaceengine.cpp +++ b/src/openspaceengine.cpp @@ -123,7 +123,7 @@ void OpenSpaceEngine::create(int argc, char** argv, int& newArgc, char**& newArg // Load the configurationmanager with the default configuration ghoul::ConfigurationManager configuration; configuration.initialize(absPath("${SCRIPTS}/DefaultConfig.lua")); - configuration.loadConfiguration(absPath("${SCRIPTS}/ExtraConfig.lua")); + configuration.loadConfiguration(absPath("${SCRIPTS}/ExtraConfigScript.lua"), false); // Create the renderenginge object _engine->_renderEngine = new RenderEngine;