From 87ae4639c7d1ab70d398f0238c77d702b54ac8d7 Mon Sep 17 00:00:00 2001
From: Jonas Strandstedt <jonas.strandstedt@gmail.com>
Date: Mon, 3 Mar 2014 15:23:04 -0500
Subject: [PATCH] Added support to Ghoul master

---
 ext/ghoul                     |  2 +-
 scripts/ExtraConfigScript.lua |  2 +-
 src/openspaceengine.cpp       | 17 +++++------------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 7ee41ec880..be4408cc1c 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 7ee41ec88007ca67bdce39d1b9dd7378c28db1ba
+Subproject commit be4408cc1cb28c365872588db907f267861984c6
diff --git a/scripts/ExtraConfigScript.lua b/scripts/ExtraConfigScript.lua
index 00eeec55f1..a2b9ca86c5 100644
--- a/scripts/ExtraConfigScript.lua
+++ b/scripts/ExtraConfigScript.lua
@@ -1,7 +1,7 @@
 musicname = "music2"
 lyrics = "This is not, the greatest lyrics in the world. This is just a tribute"
 
-configuration =
+config =
 {
 	level1_string = musicname,
 	level1_lyrics = lyrics,
diff --git a/src/openspaceengine.cpp b/src/openspaceengine.cpp
index 6ae3ed6667..c59eab9ccf 100644
--- a/src/openspaceengine.cpp
+++ b/src/openspaceengine.cpp
@@ -36,6 +36,7 @@
 #include <ghoul/filesystem/filesystem>
 #include <ghoul/logging/logging>
 #include <ghoul/misc/configurationmanager.h>
+#include <ghoul/systemcapabilities/systemcapabilities.h>
 
 using namespace ghoul::filesystem;
 using namespace ghoul::logging;
@@ -98,9 +99,6 @@ void OpenSpaceEngine::create(int argc, char** argv, int& newArgc, char**& newArg
 #endif
 	FileSys.registerPathToken("${SCRIPTS}", "${BASE_PATH}/scripts");
 	FileSys.registerPathToken("${OPENSPACE-DATA}", "${BASE_PATH}/openspace-data");
-    
-    // OLD
-	//FileSys.registerPathToken("${SCRIPTS}", "${BASE_PATH}/openspace/scripts"); // FIX ME: tempoary path
 
     _engine->_configurationManager = new ghoul::ConfigurationManager;
     _engine->_configurationManager->initialize();
@@ -120,15 +118,9 @@ void OpenSpaceEngine::create(int argc, char** argv, int& newArgc, char**& newArg
     newArgv[2] = "../config/single.xml";
 #endif
     
-    // Load the configurationmanager with the default configuration
-    ghoul::ConfigurationManager configuration;
-    configuration.initialize(absPath("${SCRIPTS}/DefaultConfig.lua"));
-    configuration.loadConfiguration(absPath("${SCRIPTS}/ExtraConfigScript.lua"), false);
-    
     // Create the renderenginge object
     _engine->_renderEngine = new RenderEngine;
     _engine->_interactionHandler = new InteractionHandler;
-
 }
 
 void OpenSpaceEngine::destroy() {
@@ -136,9 +128,10 @@ void OpenSpaceEngine::destroy() {
 }
 
 bool OpenSpaceEngine::initialize() {
-    //_configurationManager->initialize();
-    //_configurationManager->loadConfiguration("${SCRIPTS}/config.lua");
-    //_configurationManager->loadConfiguration("${SCRIPTS}/config2.lua");
+    // Load the configurationmanager with the default configuration
+    ghoul::ConfigurationManager configuration;
+    configuration.initialize(absPath("${SCRIPTS}/DefaultConfig.lua"));
+    configuration.loadConfiguration(absPath("${SCRIPTS}/ExtraConfigScript.lua"), false);
 
     Time::init();
     Spice::init();