[colobot] 194/390: Removed CMainDialog::GetPHYSFSSavegameDir()

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit 759b9871bb5de0b31df22957b311128386306430
Author: krzys-h <krzys_h at interia.pl>
Date:   Mon Nov 10 19:26:36 2014 +0100

    Removed CMainDialog::GetPHYSFSSavegameDir()
    
    CMainDialog is also finished.
    This is last commit for saving with PHYSFS, closes issue #334
---
 src/object/robotmain.cpp |  2 +-
 src/ui/maindialog.cpp    | 21 +++++++--------------
 src/ui/maindialog.h      |  3 +--
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 538109e..1fd9424 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -6614,7 +6614,7 @@ bool CRobotMain::GetRadar()
 
 const char* CRobotMain::GetSavegameDir()
 {
-    return m_dialog->GetPHYSFSSavegameDir().c_str();
+    return m_dialog->GetSavegameDir().c_str();
 }
 
 const char* CRobotMain::GetPublicDir()
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index d950f98..829fab4 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -181,7 +181,6 @@ CMainDialog::CMainDialog()
     m_savegameDir = "savegame";
     m_publicDir = "program";
     m_filesDir = "files";
-    CLogger::GetInstancePointer()->Trace("Savegame path: normal=%s, physfs=%s\n", GetSavegameDir().c_str(), GetPHYSFSSavegameDir().c_str());
 
     m_setupFull = m_app->GetVideoConfig().fullScreen;
 
@@ -5861,13 +5860,7 @@ bool CMainDialog::GetSceneSoluce()
 
 // Returns the name of the folder to save.
 
-std::string CMainDialog::GetSavegameDir()
-{
-    return CResourceManager::GetSaveLocation()+"/"+m_savegameDir;
-}
-
-//TODO: Use PHYSFS everywhere
-std::string & CMainDialog::GetPHYSFSSavegameDir()
+std::string & CMainDialog::GetSavegameDir()
 {
     return m_savegameDir;
 }
@@ -5922,7 +5915,7 @@ bool CMainDialog::GetHimselfDamage()
 void CMainDialog::WriteGamerPerso(char *gamer)
 {
     try {
-        CLevelParser* perso = new CLevelParser(GetPHYSFSSavegameDir()+"/"+gamer+"/face.gam");
+        CLevelParser* perso = new CLevelParser(GetSavegameDir()+"/"+gamer+"/face.gam");
         CLevelParserLine* line;
         
         line = new CLevelParserLine("Head");
@@ -5950,11 +5943,11 @@ void CMainDialog::ReadGamerPerso(char *gamer)
     m_perso.face = 0;
     DefPerso();
     
-    if(!CResourceManager::Exists(GetPHYSFSSavegameDir()+"/"+gamer+"/face.gam"))
+    if(!CResourceManager::Exists(GetSavegameDir()+"/"+gamer+"/face.gam"))
         return;
 
     try {
-        CLevelParser* perso = new CLevelParser(GetPHYSFSSavegameDir()+"/"+gamer+"/face.gam");
+        CLevelParser* perso = new CLevelParser(GetSavegameDir()+"/"+gamer+"/face.gam");
         perso->Load();
         CLevelParserLine* line;
         
@@ -6040,11 +6033,11 @@ bool CMainDialog::ReadGamerInfo()
         m_sceneInfo[i].bPassed = false;
     }
 
-    if(!CResourceManager::Exists(GetPHYSFSSavegameDir()+"/"+m_main->GetGamerName()+"/"+m_sceneName+".gam"))
+    if(!CResourceManager::Exists(GetSavegameDir()+"/"+m_main->GetGamerName()+"/"+m_sceneName+".gam"))
         return false;
     
     CInputStream file;
-    file.open(GetPHYSFSSavegameDir()+"/"+m_main->GetGamerName()+"/"+m_sceneName+".gam");
+    file.open(GetSavegameDir()+"/"+m_main->GetGamerName()+"/"+m_sceneName+".gam");
     if(!file.is_open()) {
         CLogger::GetInstancePointer()->Error("Unable to read list of finished missions\n");
         return false;
@@ -6080,7 +6073,7 @@ bool CMainDialog::WriteGamerInfo()
     int     i;
 
     COutputStream file;
-    file.open(GetPHYSFSSavegameDir()+"/"+m_main->GetGamerName()+"/"+m_sceneName+".gam");
+    file.open(GetSavegameDir()+"/"+m_main->GetGamerName()+"/"+m_sceneName+".gam");
     if(!file.is_open()) {
         CLogger::GetInstancePointer()->Error("Unable to read list of finished missions\n");
         return false;
diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h
index a5eeb7b..aa98e3e 100644
--- a/src/ui/maindialog.h
+++ b/src/ui/maindialog.h
@@ -86,8 +86,7 @@ public:
     int           GetSceneRank();
     const char*   GetSceneDir();
     bool          GetSceneSoluce();
-    std::string   GetSavegameDir();
-    std::string & GetPHYSFSSavegameDir();
+    std::string & GetSavegameDir();
     std::string & GetPublicDir();
 
     bool    GetTooltip();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git