faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Unified how pathes are interpreted in config.xml.

Browse Source
This commit is contained in:
Faerbit 2015-02-14 09:55:43 +01:00
parent 89a73f3776
commit e88ff9f1ac
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application.cc
View File

@ -97,7 +97,7 @@ void Application::setFarPlane(float farPlane) {
} }
void Application::setCompositionsPath(std::string compositionsPath) { void Application::setCompositionsPath(std::string compositionsPath) {
this->compositionsPath = compositionsPath; this->compositionsPath = "../" + compositionsPath;
} }
void Application::setShaderPath(std::string shaderPath) { void Application::setShaderPath(std::string shaderPath) {
@ -113,15 +113,15 @@ void Application::setTexturePath(std::string texturePath) {
} }
void Application::setScriptPath(std::string scriptPath) { void Application::setScriptPath(std::string scriptPath) {
this->scriptPath = scriptPath; this->scriptPath = "../" + scriptPath;
} }
void Application::setHeightmapPath(std::string heightmapPath) { void Application::setHeightmapPath(std::string heightmapPath) {
this->heightmapPath = heightmapPath; this->heightmapPath = "../" + heightmapPath;
} }
void Application::setLevelXmlPath(std::string levelXmlPath) { void Application::setLevelXmlPath(std::string levelXmlPath) {
this->levelXmlPath = levelXmlPath; this->levelXmlPath = "../" + levelXmlPath;
} }
void Application::setMaxShadowRenderCount(int count) { void Application::setMaxShadowRenderCount(int count) {

8
data/config.xml
View File

@ -9,7 +9,7 @@
<maxShadowRenderCount>10</maxShadowRenderCount> <maxShadowRenderCount>10</maxShadowRenderCount>
<compositionsPath>../data/levels/Compositions.xml</compositionsPath> <compositionsPath>data/levels/Compositions.xml</compositionsPath>
<shaderPath>data/shader/</shaderPath> <shaderPath>data/shader/</shaderPath>
@ -17,8 +17,8 @@
<texturePath>data/textures/</texturePath> <texturePath>data/textures/</texturePath>
<scriptPath>../data/levels/scripts/</scriptPath> <scriptPath>data/levels/scripts/</scriptPath>
<heightmapPath>../data/levels/</heightmapPath> <heightmapPath>data/levels/</heightmapPath>
<levelXmlPath>../data/levels/</levelXmlPath> <levelXmlPath>data/levels/</levelXmlPath>