From e88ff9f1ac29209769d324d42c0409878c477048 Mon Sep 17 00:00:00 2001 From: Faerbit Date: Sat, 14 Feb 2015 09:55:43 +0100 Subject: [PATCH] Unified how pathes are interpreted in config.xml. --- application.cc | 8 ++++---- data/config.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application.cc b/application.cc index 0c23dbd..42175c0 100644 --- a/application.cc +++ b/application.cc @@ -97,7 +97,7 @@ void Application::setFarPlane(float farPlane) { } void Application::setCompositionsPath(std::string compositionsPath) { - this->compositionsPath = compositionsPath; + this->compositionsPath = "../" + compositionsPath; } void Application::setShaderPath(std::string shaderPath) { @@ -113,15 +113,15 @@ void Application::setTexturePath(std::string texturePath) { } void Application::setScriptPath(std::string scriptPath) { - this->scriptPath = scriptPath; + this->scriptPath = "../" + scriptPath; } void Application::setHeightmapPath(std::string heightmapPath) { - this->heightmapPath = heightmapPath; + this->heightmapPath = "../" + heightmapPath; } void Application::setLevelXmlPath(std::string levelXmlPath) { - this->levelXmlPath = levelXmlPath; + this->levelXmlPath = "../" + levelXmlPath; } void Application::setMaxShadowRenderCount(int count) { diff --git a/data/config.xml b/data/config.xml index b582096..f46e6b4 100644 --- a/data/config.xml +++ b/data/config.xml @@ -9,7 +9,7 @@ 10 -../data/levels/Compositions.xml +data/levels/Compositions.xml data/shader/ @@ -17,8 +17,8 @@ data/textures/ -../data/levels/scripts/ +data/levels/scripts/ -../data/levels/ +data/levels/ -../data/levels/ +data/levels/