summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2014-09-29 21:53:21 +0200
committerkrzys-h <krzys_h@interia.pl>2014-09-29 21:53:21 +0200
commit3ef2f976df56817d2a23d4fe88a1917798beaacd (patch)
tree28db218c8f6ac60578e038fd2191269b48201e87
parentc2b878745360b302dab2a14624a55c6990ad4510 (diff)
downloadcolobot-3ef2f976df56817d2a23d4fe88a1917798beaacd.tar.gz
colobot-3ef2f976df56817d2a23d4fe88a1917798beaacd.tar.bz2
colobot-3ef2f976df56817d2a23d4fe88a1917798beaacd.zip
Added %chap% for current chapter directory
-rw-r--r--src/object/level/parser.cpp2
-rw-r--r--src/object/level/parserparam.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/object/level/parser.cpp b/src/object/level/parser.cpp
index 383931c..2bd43a3 100644
--- a/src/object/level/parser.cpp
+++ b/src/object/level/parser.cpp
@@ -63,7 +63,7 @@ std::string CLevelParser::BuildSceneName(std::string category, int chapter, int
if(category == "custom")
{
outstream << "levels/custom/";
- outstream << CRobotMain::GetInstancePointer()->GetUserLevelName(chapter) << "/";
+ outstream << CRobotMain::GetInstancePointer()->GetUserLevelName(chapter);
if(rank == 000)
{
if(sceneFile)
diff --git a/src/object/level/parserparam.cpp b/src/object/level/parserparam.cpp
index 50152c5..4dc5742 100644
--- a/src/object/level/parserparam.cpp
+++ b/src/object/level/parserparam.cpp
@@ -165,6 +165,8 @@ std::string CLevelParserParam::InjectLevelDir(std::string path, const std::strin
std::string newPath = path;
std::string lvlDir = CLevelParser::BuildSceneName(CRobotMain::GetInstancePointer()->GetSceneName(), CRobotMain::GetInstancePointer()->GetSceneRank()/100, CRobotMain::GetInstancePointer()->GetSceneRank()%100, false);
boost::replace_all(newPath, "%lvl%", lvlDir);
+ std::string chapDir = CLevelParser::BuildSceneName(CRobotMain::GetInstancePointer()->GetSceneName(), CRobotMain::GetInstancePointer()->GetSceneRank()/100, 0, false);
+ boost::replace_all(newPath, "%chap%", chapDir);
if(newPath == path)
{
newPath = defaultDir + (!defaultDir.empty() ? "/" : "") + newPath;