[colobot] 191/390: Removed CRobotMain::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 4994965201b50a5eeaa3759dc137fba7c6adf70e
Author: krzys-h <krzys_h at interia.pl>
Date:   Mon Nov 10 19:02:07 2014 +0100

    Removed CRobotMain::GetPHYSFSSavegameDir()
    
    Everything in CRobotMain uses PHYSFS now
---
 src/object/robotmain.cpp | 18 ++++++------------
 src/object/robotmain.h   |  1 -
 src/ui/studio.cpp        |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 7da548d..48eb2ec 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -5439,7 +5439,7 @@ void CRobotMain::LoadOneScript(CObject *obj, int &nbError)
 
         char filename[MAX_FNAME];
         sprintf(filename, "%s/%s/%c%.3d%.3d%.1d.txt",
-                    GetPHYSFSSavegameDir(), m_gamerName.c_str(), name[0], rank, objRank, i);
+                    GetSavegameDir(), m_gamerName.c_str(), name[0], rank, objRank, i);
         brain->ReadProgram(i, filename);
         if (!brain->GetCompile(i)) nbError++;
     }
@@ -5505,7 +5505,7 @@ void CRobotMain::SaveOneScript(CObject *obj)
     {
         char filename[MAX_FNAME];
         sprintf(filename, "%s/%s/%c%.3d%.3d%.1d.txt",
-                    GetPHYSFSSavegameDir(), m_gamerName.c_str(), name[0], rank, objRank, i);
+                    GetSavegameDir(), m_gamerName.c_str(), name[0], rank, objRank, i);
         brain->WriteProgram(i, filename);
     }
 }
@@ -6008,7 +6008,7 @@ void CRobotMain::WriteFreeParam()
     if (m_gamerName == "") return;
 
     COutputStream file;
-    file.open(std::string(GetPHYSFSSavegameDir())+"/"+m_gamerName+"/research.gam");
+    file.open(std::string(GetSavegameDir())+"/"+m_gamerName+"/research.gam");
     if(!file.is_open())
     {
         CLogger::GetInstancePointer()->Error("Unable to write free game unlock state\n");
@@ -6028,11 +6028,11 @@ void CRobotMain::ReadFreeParam()
 
     if (m_gamerName == "") return;
 
-    if(!CResourceManager::Exists(std::string(GetPHYSFSSavegameDir())+"/"+m_gamerName+"/research.gam"))
+    if(!CResourceManager::Exists(std::string(GetSavegameDir())+"/"+m_gamerName+"/research.gam"))
         return;
     
     CInputStream file;
-    file.open(std::string(GetPHYSFSSavegameDir())+"/"+m_gamerName+"/research.gam");
+    file.open(std::string(GetSavegameDir())+"/"+m_gamerName+"/research.gam");
     if(!file.is_open())
     {
         CLogger::GetInstancePointer()->Error("Unable to read free game unlock state\n");
@@ -6612,15 +6612,9 @@ bool CRobotMain::GetRadar()
     return false;
 }
 
-//TODO: Use PHYSFS everywhere
-const char* CRobotMain::GetPHYSFSSavegameDir()
-{
-    return m_dialog->GetPHYSFSSavegameDir().c_str();
-}
-
 const char* CRobotMain::GetSavegameDir()
 {
-    return m_dialog->GetSavegameDir().c_str();
+    return m_dialog->GetPHYSFSSavegameDir().c_str();
 }
 
 const char* CRobotMain::GetPublicDir()
diff --git a/src/object/robotmain.h b/src/object/robotmain.h
index f83d930..1affd1f 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -332,7 +332,6 @@ public:
     bool        GetSceneSoluce();
     bool        GetShowAll();
     bool        GetRadar();
-    const char* GetPHYSFSSavegameDir();
     const char* GetSavegameDir();
     const char* GetPublicDir();
     const char* GetFilesDir();
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp
index 4551d7b..7198b91 100644
--- a/src/ui/studio.cpp
+++ b/src/ui/studio.cpp
@@ -1528,7 +1528,7 @@ std::string CStudio::SearchDirectory(bool bCreate)
     }
     else
     {
-        dir = std::string(m_main->GetPHYSFSSavegameDir()) + "/" + std::string(m_main->GetGamerName()) + "/program/";
+        dir = std::string(m_main->GetSavegameDir()) + "/" + std::string(m_main->GetGamerName()) + "/program/";
     }
 
     if ( bCreate )

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