summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2014-10-30 22:17:47 +0100
committerkrzys-h <krzys_h@interia.pl>2014-10-30 22:18:33 +0100
commitc1f931c8ee301ffb49871ead236b048f168916da (patch)
tree9fc2e288439fb24ac871b303cd07c0597d5a3145
parent066344dde3e2706df39ee72f56fe39d144f2953b (diff)
downloadcolobot-c1f931c8ee301ffb49871ead236b048f168916da.tar.gz
colobot-c1f931c8ee301ffb49871ead236b048f168916da.tar.bz2
colobot-c1f931c8ee301ffb49871ead236b048f168916da.zip
Added some debug stuff, possible fix for #348 and #335
-rw-r--r--src/app/app.cpp2
-rw-r--r--src/ui/maindialog.cpp7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp
index ea54cf1..ae1f82a 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -420,6 +420,8 @@ bool CApplication::Create()
LoadModsFromDir(m_dataPath+"/mods");
LoadModsFromDir(m_savePath+"/mods");
+ GetLogger()->Info("Data path: %s\n", m_dataPath.c_str());
+ GetLogger()->Info("Save path: %s\n", m_savePath.c_str());
CResourceManager::AddLocation(m_dataPath, false);
CResourceManager::SetSaveLocation(m_savePath);
CResourceManager::AddLocation(m_savePath, true);
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index 051cd94..21e2b74 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -185,6 +185,7 @@ CMainDialog::CMainDialog()
m_savegameDir = "savegame";
m_publicDir = CResourceManager::GetSaveLocation()+"/program"; //TODO: Refactor to use PHYSFS
m_filesDir = CResourceManager::GetSaveLocation()+"/files"; //TODO: Refactor to use PHYSFS
+ CLogger::GetInstancePointer()->Trace("Savegame path: normal=%s, physfs=%s\n", GetSavegameDir().c_str(), GetPHYSFSSavegameDir().c_str());
m_setupFull = m_app->GetVideoConfig().fullScreen;
@@ -4165,7 +4166,7 @@ void CMainDialog::IOUpdateList()
return;
std::string filename = (m_saveList.at(sel) / "screen.png").make_preferred().string();
- boost::replace_all(filename, CResourceManager::GetSaveLocation()+"/", ""); //TODO: Refactor everything to PHYSFS, see issue #334
+ boost::replace_all(filename, GetSavegameDir(), GetPHYSFSSavegameDir()); //TODO: Refactor everything to PHYSFS, see issue #334
filename = "../"+filename;
if ( m_phase == PHASE_WRITE || m_phase == PHASE_WRITEs )
{
@@ -6000,7 +6001,9 @@ bool CMainDialog::GetSceneSoluce()
std::string CMainDialog::GetSavegameDir()
{
- return CResourceManager::GetSaveLocation()+"/"+m_savegameDir;
+ std::string out = CResourceManager::GetSaveLocation()+"/"+m_savegameDir;
+ boost::replace_all(out, "\\", "/");
+ return out;
}
//TODO: Use PHYSFS everywhere