summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2014-06-26 22:14:30 +0200
committerkrzys-h <krzys_h@interia.pl>2014-06-26 22:14:30 +0200
commit092e7cc68de3d4e46505a2931ce266b4e5aabaab (patch)
tree9d622b9aeae83560f81d0571516a100260453fe5 /src/app
parentfd8ea13cbbe276de899a35f2772a1f05ab79c596 (diff)
downloadcolobot-092e7cc68de3d4e46505a2931ce266b4e5aabaab.tar.gz
colobot-092e7cc68de3d4e46505a2931ce266b4e5aabaab.tar.bz2
colobot-092e7cc68de3d4e46505a2931ce266b4e5aabaab.zip
Fixed tests
Diffstat (limited to 'src/app')
-rw-r--r--src/app/gamedata.cpp20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/app/gamedata.cpp b/src/app/gamedata.cpp
index 05c0242..ceeb7b3 100644
--- a/src/app/gamedata.cpp
+++ b/src/app/gamedata.cpp
@@ -101,9 +101,25 @@ std::string CGameData::GetFilePath(DataDir dir, const std::string& subpath)
}
}
- GetLogger()->Error("file subpath error\n");
+ if(m_dataDirs.size() > 0) {
+ std::stringstream str;
+ if ( subpath.find("save") == std::string::npos ){ // if its NOT a path to a savefile screenshot
+ str << m_dataDirs[0];
+ str << "/";
+ str << m_standardDataDirs[index];
+
+ if (dir == DIR_HELP)
+ {
+ str << "/";
+ str << CApplication::GetInstancePointer()->GetLanguageChar();
+ }
+ str << "/";
+ }
+ str << subpath;
+ return str.str();
+ }
- return "";
+ return subpath;
}
std::string CGameData::GetDataPath(const std::string &subpath)