diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-11-01 14:02:39 +0100 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-11-01 14:02:39 +0100 |
| commit | 11a874207935f86248c0b9034a11b415ee14b1cf (patch) | |
| tree | 410cf2842bd79638c4c7cfd36edd76c6efebb4a4 /src/object | |
| parent | f7f9ac08b3cec00ab4793333ab6824b7829d6890 (diff) | |
| download | colobot-11a874207935f86248c0b9034a11b415ee14b1cf.tar.gz colobot-11a874207935f86248c0b9034a11b415ee14b1cf.tar.bz2 colobot-11a874207935f86248c0b9034a11b415ee14b1cf.zip | |
#335, #348, #352
I don't know what I'm doing anymore :/
I should set up dev envrioment on Windows so I don't have to commit every time I want somebody on Windows to test if my changes work
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/robotmain.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index cc330f6..2c9384c 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -32,6 +32,7 @@ #include "common/profile.h" #include "common/restext.h" +#include "common/resources/resourcemanager.h" #include "common/resources/inputstream.h" #include "graphics/engine/camera.h" @@ -5482,8 +5483,10 @@ void CRobotMain::LoadFileScript(CObject *obj, const char* filename, int objRank, std::string fnstr = filename; + std::string savedir = CResourceManager::GetSaveLocation()+"/"; boost::replace_all(fnstr, "\\", "/"); - boost::replace_all(fnstr, m_dialog->GetSavegameDir(), m_dialog->GetPHYSFSSavegameDir()); //TODO: Refactor to get physfs path here + boost::replace_all(savedir, "\\", "/"); + boost::replace_all(fnstr, savedir, ""); //TODO: Refactor to get physfs path here //TODO: Refactor to std::string char fn[MAX_FNAME]; strcpy(fn, fnstr.c_str()); @@ -5554,8 +5557,10 @@ void CRobotMain::SaveFileScript(CObject *obj, const char* filename, int objRank) if (type == OBJECT_HUMAN) return; std::string fnstr = filename; + std::string savedir = CResourceManager::GetSaveLocation()+"/"; boost::replace_all(fnstr, "\\", "/"); - boost::replace_all(fnstr, m_dialog->GetSavegameDir(), m_dialog->GetPHYSFSSavegameDir()); //TODO: Refactor to get physfs path here + boost::replace_all(savedir, "\\", "/"); + boost::replace_all(fnstr, savedir, ""); //TODO: Refactor to get physfs path here //TODO: Refactor to std::string char fn[MAX_FNAME]; strcpy(fn, fnstr.c_str()); |