From 7dc3e90e419a5738020835b5879b9a1cfdbb470e Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sun, 19 Jul 2015 15:34:49 +0200 Subject: [PATCH] CPlayerProgress -> CPlayerProfile --- src/CMakeLists.txt | 2 +- ...player_progress.cpp => player_profile.cpp} | 58 ++++++++--------- .../{player_progress.h => player_profile.h} | 6 +- src/object/robotmain.cpp | 48 +++++++------- src/object/robotmain.h | 6 +- src/ui/maindialog.cpp | 62 +++++++++---------- src/ui/studio.cpp | 4 +- 7 files changed, 93 insertions(+), 93 deletions(-) rename src/object/{player_progress.cpp => player_profile.cpp} (86%) rename src/object/{player_progress.h => player_profile.h} (97%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 56002ea6..4157c91f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -170,7 +170,7 @@ set(BASE_SOURCES object/object_manager.cpp object/old_object.cpp object/old_object_interface.cpp - object/player_progress.cpp + object/player_profile.cpp object/robotmain.cpp object/scene_conditions.cpp object/task/task.cpp diff --git a/src/object/player_progress.cpp b/src/object/player_profile.cpp similarity index 86% rename from src/object/player_progress.cpp rename to src/object/player_profile.cpp index ed3b5bb2..211e75ca 100644 --- a/src/object/player_progress.cpp +++ b/src/object/player_profile.cpp @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see http://gnu.org/licenses */ -#include "object/player_progress.h" +#include "object/player_profile.h" #include "common/logger.h" #include "common/make_unique.h" @@ -72,7 +72,7 @@ void PlayerApperance::DefPerso() this->colorBand.a = 0.0f; } -CPlayerProgress::CPlayerProgress(std::string playerName) +CPlayerProfile::CPlayerProfile(std::string playerName) { m_playerName = playerName; GetConfigFile().SetStringProperty("Gamer", "LastName", m_playerName); @@ -92,7 +92,7 @@ CPlayerProgress::CPlayerProgress(std::string playerName) LoadApperance(); } -std::string CPlayerProgress::GetLastName() +std::string CPlayerProfile::GetLastName() { std::string name; @@ -102,47 +102,47 @@ std::string CPlayerProgress::GetLastName() return name; } -CPlayerProgress::~CPlayerProgress() +CPlayerProfile::~CPlayerProfile() { } -bool CPlayerProgress::Delete() +bool CPlayerProfile::Delete() { return CResourceManager::RemoveDirectory(GetSaveDir()); } -std::string CPlayerProgress::GetName() +std::string CPlayerProfile::GetName() { return m_playerName; } -std::string CPlayerProgress::GetSaveDir() +std::string CPlayerProfile::GetSaveDir() { return std::string(CRobotMain::GetInstancePointer()->GetSavegameDir()) + "/" + m_playerName; } -std::string CPlayerProgress::GetSaveFile(std::string filename) +std::string CPlayerProfile::GetSaveFile(std::string filename) { return GetSaveDir() + "/" + filename; } // FINISHED LEVELS -void CPlayerProgress::IncrementLevelTryCount(LevelCategory cat, int chap, int rank) +void CPlayerProfile::IncrementLevelTryCount(LevelCategory cat, int chap, int rank) { m_levelInfo[cat][chap][rank].numTry ++; SaveFinishedLevels(cat); } -int CPlayerProgress::GetLevelTryCount(LevelCategory cat, int chap, int rank) +int CPlayerProfile::GetLevelTryCount(LevelCategory cat, int chap, int rank) { if(!m_levelInfoLoaded[cat]) LoadFinishedLevels(cat); return m_levelInfo[cat][chap][rank].numTry; } -void CPlayerProgress::SetLevelPassed(LevelCategory cat, int chap, int rank, bool bPassed) +void CPlayerProfile::SetLevelPassed(LevelCategory cat, int chap, int rank, bool bPassed) { m_levelInfo[cat][chap][rank].bPassed = bPassed; SaveFinishedLevels(cat); @@ -154,14 +154,14 @@ void CPlayerProgress::SetLevelPassed(LevelCategory cat, int chap, int rank, bool } } -bool CPlayerProgress::GetLevelPassed(LevelCategory cat, int chap, int rank) +bool CPlayerProfile::GetLevelPassed(LevelCategory cat, int chap, int rank) { if(!m_levelInfoLoaded[cat]) LoadFinishedLevels(cat); return m_levelInfo[cat][chap][rank].bPassed; } -int CPlayerProgress::GetChapPassed(LevelCategory cat) +int CPlayerProfile::GetChapPassed(LevelCategory cat) { if ( CRobotMain::GetInstancePointer()->GetShowAll() ) return MAXSCENE; @@ -175,13 +175,13 @@ int CPlayerProgress::GetChapPassed(LevelCategory cat) return MAXSCENE; } -void CPlayerProgress::SetSelectedChap(LevelCategory category, int chap) +void CPlayerProfile::SetSelectedChap(LevelCategory category, int chap) { m_selectChap[category] = chap; SaveFinishedLevels(category); } -int CPlayerProgress::GetSelectedChap(LevelCategory category) +int CPlayerProfile::GetSelectedChap(LevelCategory category) { if(!m_levelInfoLoaded[category]) LoadFinishedLevels(category); @@ -189,13 +189,13 @@ int CPlayerProgress::GetSelectedChap(LevelCategory category) return m_selectChap[category]; } -void CPlayerProgress::SetSelectedRank(LevelCategory category, int rank) +void CPlayerProfile::SetSelectedRank(LevelCategory category, int rank) { m_selectRank[category] = rank; SaveFinishedLevels(category); } -int CPlayerProgress::GetSelectedRank(LevelCategory category) +int CPlayerProfile::GetSelectedRank(LevelCategory category) { if(!m_levelInfoLoaded[category]) LoadFinishedLevels(category); @@ -203,7 +203,7 @@ int CPlayerProgress::GetSelectedRank(LevelCategory category) return m_selectRank[category]; } -void CPlayerProgress::LoadFinishedLevels(LevelCategory category) +void CPlayerProfile::LoadFinishedLevels(LevelCategory category) { m_levelInfo[category].clear(); std::string filename = GetSaveFile(GetLevelCategoryDir(category)+".gam"); @@ -246,7 +246,7 @@ void CPlayerProgress::LoadFinishedLevels(LevelCategory category) m_levelInfoLoaded[category] = true; } -void CPlayerProgress::SaveFinishedLevels(LevelCategory category) +void CPlayerProfile::SaveFinishedLevels(LevelCategory category) { std::string filename = GetSaveFile(GetLevelCategoryDir(category)+".gam"); COutputStream file; @@ -276,7 +276,7 @@ void CPlayerProgress::SaveFinishedLevels(LevelCategory category) // FREE GAME UNLOCK -int CPlayerProgress::GetFreeGameBuildUnlock() +int CPlayerProfile::GetFreeGameBuildUnlock() { if(!m_freegameLoaded) LoadFreeGameUnlock(); @@ -284,26 +284,26 @@ int CPlayerProgress::GetFreeGameBuildUnlock() return m_freegameBuild; } -void CPlayerProgress::SetFreeGameBuildUnlock(int freeBuild) +void CPlayerProfile::SetFreeGameBuildUnlock(int freeBuild) { m_freegameBuild = freeBuild; SaveFreeGameUnlock(); } -int CPlayerProgress::GetFreeGameResearchUnlock() +int CPlayerProfile::GetFreeGameResearchUnlock() { if(!m_freegameLoaded) LoadFreeGameUnlock(); return m_freegameResearch; } -void CPlayerProgress::SetFreeGameResearchUnlock(int freeResearch) +void CPlayerProfile::SetFreeGameResearchUnlock(int freeResearch) { m_freegameResearch = freeResearch; SaveFreeGameUnlock(); } -void CPlayerProgress::LoadFreeGameUnlock() +void CPlayerProfile::LoadFreeGameUnlock() { m_freegameResearch = 0; m_freegameBuild = 0; @@ -330,7 +330,7 @@ void CPlayerProgress::LoadFreeGameUnlock() m_freegameLoaded = false; } -void CPlayerProgress::SaveFreeGameUnlock() +void CPlayerProfile::SaveFreeGameUnlock() { std::string filename = GetSaveFile("research.gam"); COutputStream file; @@ -348,12 +348,12 @@ void CPlayerProgress::SaveFreeGameUnlock() // APPERANCE -PlayerApperance& CPlayerProgress::GetApperance() +PlayerApperance& CPlayerProfile::GetApperance() { return m_apperance; } -void CPlayerProgress::LoadApperance() +void CPlayerProfile::LoadApperance() { m_apperance.face = 0; m_apperance.DefPerso(); @@ -383,7 +383,7 @@ void CPlayerProgress::LoadApperance() } } -void CPlayerProgress::SaveApperance() +void CPlayerProfile::SaveApperance() { try { @@ -411,7 +411,7 @@ void CPlayerProgress::SaveApperance() // SAVE / LOAD SCENE -void CPlayerProgress::SaveScene(std::string dir, std::string info) +void CPlayerProfile::SaveScene(std::string dir, std::string info) { if (!CResourceManager::DirectoryExists(dir)) { diff --git a/src/object/player_progress.h b/src/object/player_profile.h similarity index 97% rename from src/object/player_progress.h rename to src/object/player_profile.h index d8cb1d7d..69042fc3 100644 --- a/src/object/player_progress.h +++ b/src/object/player_profile.h @@ -42,12 +42,12 @@ struct PlayerApperance void DefPerso(); }; -class CPlayerProgress +class CPlayerProfile { public: - CPlayerProgress(std::string playerName); + CPlayerProfile(std::string playerName); static std::string GetLastName(); - ~CPlayerProgress(); + ~CPlayerProfile(); bool Delete(); diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 8a888d98..c0a86b29 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -67,7 +67,7 @@ #include "object/object.h" #include "object/object_create_exception.h" #include "object/object_manager.h" -#include "object/player_progress.h" +#include "object/player_profile.h" #include "object/scene_conditions.h" #include "object/task/task.h" #include "object/task/taskbuild.h" @@ -317,7 +317,7 @@ void CRobotMain::Create() m_engine->SetTracePrecision(1.0f); - SelectPlayer(CPlayerProgress::GetLastName()); + SelectPlayer(CPlayerProfile::GetLastName()); CScriptFunctions::m_filesDir = CResourceManager::GetSaveLocation() + "/" + m_dialog->GetFilesDir(); //TODO: Refactor to PHYSFS while rewriting CBot engine CScriptFunctions::Init(); @@ -434,7 +434,7 @@ void CRobotMain::ChangePhase(Phase phase) LevelCategory cat = m_dialog->GetLevelCategory(); int chap = m_dialog->GetLevelChap(); int rank = m_dialog->GetLevelRank(); - m_playerProgress->IncrementLevelTryCount(cat, chap, rank); + m_playerProfile->IncrementLevelTryCount(cat, chap, rank); } } @@ -443,7 +443,7 @@ void CRobotMain::ChangePhase(Phase phase) LevelCategory cat = m_dialog->GetLevelCategory(); int chap = m_dialog->GetLevelChap(); int rank = m_dialog->GetLevelRank(); - m_playerProgress->SetLevelPassed(cat, chap, rank, true); + m_playerProfile->SetLevelPassed(cat, chap, rank, true); m_dialog->NextMission(); // passes to the next mission } @@ -3888,15 +3888,15 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) if (category == LevelCategory::Missions && !resetObject) // mission? { - m_playerProgress->SetFreeGameResearchUnlock(m_playerProgress->GetFreeGameResearchUnlock() | m_researchDone[0]); - m_playerProgress->SetFreeGameBuildUnlock(m_playerProgress->GetFreeGameBuildUnlock() | m_build); + m_playerProfile->SetFreeGameResearchUnlock(m_playerProfile->GetFreeGameResearchUnlock() | m_researchDone[0]); + m_playerProfile->SetFreeGameBuildUnlock(m_playerProfile->GetFreeGameBuildUnlock() | m_build); } if (category == LevelCategory::FreeGame && !resetObject) // free play? { - m_researchDone[0] = m_playerProgress->GetFreeGameResearchUnlock(); + m_researchDone[0] = m_playerProfile->GetFreeGameResearchUnlock(); - m_build = m_playerProgress->GetFreeGameBuildUnlock(); + m_build = m_playerProfile->GetFreeGameBuildUnlock(); m_build &= ~BUILD_RESEARCH; m_build &= ~BUILD_LABO; m_build |= BUILD_FACTORY; @@ -4027,11 +4027,11 @@ void CRobotMain::ChangeColor() colorRef1.r = 206.0f/256.0f; colorRef1.g = 206.0f/256.0f; colorRef1.b = 204.0f/256.0f; // ~white - colorNew1 = m_playerProgress->GetApperance().colorCombi; + colorNew1 = m_playerProfile->GetApperance().colorCombi; colorRef2.r = 255.0f/256.0f; colorRef2.g = 132.0f/256.0f; colorRef2.b = 1.0f/256.0f; // orange - colorNew2 = m_playerProgress->GetApperance().colorBand; + colorNew2 = m_playerProfile->GetApperance().colorBand; Math::Point exclu[6]; exclu[0] = Math::Point(192.0f/256.0f, 0.0f/256.0f); @@ -4073,7 +4073,7 @@ void CRobotMain::ChangeColor() colorRef1.b = 0.0f/256.0f; // yellow tolerance = 0.20f; } - colorNew1 = m_playerProgress->GetApperance().colorHair; + colorNew1 = m_playerProfile->GetApperance().colorHair; colorRef2.r = 0.0f; colorRef2.g = 0.0f; colorRef2.b = 0.0f; @@ -4605,7 +4605,7 @@ void CRobotMain::LoadOneScript(CObject *obj, int &nbError) char file[MAX_FNAME]; sprintf(file, "%c%.3d%.3d%.3d%.3d.txt", categoryChar, chap, rank, objRank, i); - std::string filename = m_playerProgress->GetSaveFile(file); + std::string filename = m_playerProfile->GetSaveFile(file); if (CResourceManager::Exists(filename)) { @@ -4680,7 +4680,7 @@ void CRobotMain::SaveOneScript(CObject *obj) { char file[MAX_FNAME]; sprintf(file, "%c%.3d%.3d%.3d%.3d.txt", categoryChar, chap, rank, objRank, i); - std::string filename = m_playerProgress->GetSaveFile(file); + std::string filename = m_playerProfile->GetSaveFile(file); if (i < programs.size()) { @@ -5238,13 +5238,13 @@ void CRobotMain::SelectPlayer(std::string playerName) { assert(!playerName.empty()); - m_playerProgress = MakeUnique(playerName); + m_playerProfile = MakeUnique(playerName); SetGlobalGamerName(playerName); } -CPlayerProgress* CRobotMain::GetPlayerProgress() +CPlayerProfile* CRobotMain::GetPlayerProfile() { - return m_playerProgress.get(); + return m_playerProfile.get(); } @@ -5667,13 +5667,13 @@ MissionType CRobotMain::GetMissionType() //! Returns the representation to use for the player int CRobotMain::GetGamerFace() { - return m_playerProgress->GetApperance().face; + return m_playerProfile->GetApperance().face; } //! Returns the representation to use for the player int CRobotMain::GetGamerGlasses() { - return m_playerProgress->GetApperance().glasses; + return m_playerProfile->GetApperance().glasses; } //! Returns the mode with just the head @@ -5982,7 +5982,7 @@ int CRobotMain::AutosaveRotate(bool freeOne) { GetLogger()->Debug("Rotate autosaves...\n"); // Find autosave dirs - auto saveDirs = CResourceManager::ListDirectories(m_playerProgress->GetSaveDir()); + auto saveDirs = CResourceManager::ListDirectories(m_playerProfile->GetSaveDir()); std::map autosaveDirs; for (auto& dir : saveDirs) { @@ -5992,7 +5992,7 @@ int CRobotMain::AutosaveRotate(bool freeOne) if (dir.substr(0, autosavePrefix.length()) == "autosave") { int id = boost::lexical_cast(dir.substr(autosavePrefix.length())); - autosaveDirs[id] = m_playerProgress->GetSaveFile(dir); + autosaveDirs[id] = m_playerProfile->GetSaveFile(dir); } } catch (...) @@ -6034,7 +6034,7 @@ int CRobotMain::AutosaveRotate(bool freeOne) { for (auto& save : autosavesToKeep) { - std::string newDir = m_playerProgress->GetSaveFile("autosave" + boost::lexical_cast(save.first)); + std::string newDir = m_playerProfile->GetSaveFile("autosave" + boost::lexical_cast(save.first)); GetLogger()->Trace("Rename %s -> %s\n", save.second.c_str(), newDir.c_str()); CResourceManager::Move(save.second, newDir); } @@ -6048,13 +6048,13 @@ void CRobotMain::Autosave() int id = AutosaveRotate(true); GetLogger()->Info("Autosave!\n"); - std::string dir = m_playerProgress->GetSaveFile("autosave" + boost::lexical_cast(id)); + std::string dir = m_playerProfile->GetSaveFile("autosave" + boost::lexical_cast(id)); char timestr[100]; TimeToAscii(time(NULL), timestr); std::string info = std::string("[AUTOSAVE] ")+timestr; - m_playerProgress->SaveScene(dir, info); + m_playerProfile->SaveScene(dir, info); } void CRobotMain::SetExitAfterMission(bool exit) @@ -6162,7 +6162,7 @@ void CRobotMain::MarkResearchDone(ResearchType type, int team) if(team == 0) { - m_playerProgress->SetFreeGameResearchUnlock(m_playerProgress->GetFreeGameResearchUnlock() | m_researchDone[0]); + m_playerProfile->SetFreeGameResearchUnlock(m_playerProfile->GetFreeGameResearchUnlock() | m_researchDone[0]); } } diff --git a/src/object/robotmain.h b/src/object/robotmain.h index afc3d9ff..19fbc8ef 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -86,7 +86,7 @@ class CInput; class CObjectManager; class CSceneEndCondition; class CAudioChangeCondition; -class CPlayerProgress; +class CPlayerProfile; namespace Gfx { class CEngine; @@ -302,7 +302,7 @@ public: char* GetNewScriptName(ObjectType type, int rank); void SelectPlayer(std::string playerName); - CPlayerProgress* GetPlayerProgress(); + CPlayerProfile* GetPlayerProfile(); bool IsBusy(); bool IOWriteScene(const char *filename, const char *filecbot, char *info); @@ -450,7 +450,7 @@ protected: CInput* m_input; //! Progress of loaded player - std::unique_ptr m_playerProgress; + std::unique_ptr m_playerProfile; //! Time since level start, including pause and intro movie diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 9ed31e54..27ceb1c6 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -40,7 +40,7 @@ #include "object/level/parser.h" -#include "object/player_progress.h" +#include "object/player_profile.h" #include "object/robotmain.h" #include "sound/sound.h" @@ -418,13 +418,13 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 18.0f/480.0f; pe = pw->CreateEdit(pos, ddim, 0, EVENT_INTERFACE_NEDIT); pe->SetMaxChar(15); - if(m_main->GetPlayerProgress() != nullptr) + if(m_main->GetPlayerProfile() != nullptr) { - name = m_main->GetPlayerProgress()->GetName(); + name = m_main->GetPlayerProfile()->GetName(); } else { - name = CPlayerProgress::GetLastName(); + name = CPlayerProfile::GetLastName(); } pe->SetText(name.c_str()); pe->SetCursor(name.length(), 0); @@ -697,7 +697,7 @@ void CMainDialog::ChangePhase(Phase phase) m_apperanceTab = 0; m_apperanceAngle = -0.6f; - m_main->GetPlayerProgress()->LoadApperance(); + m_main->GetPlayerProfile()->LoadApperance(); UpdatePerso(); m_main->ScenePerso(); CameraPerso(); @@ -735,7 +735,7 @@ void CMainDialog::ChangePhase(Phase phase) if ( m_phase == PHASE_FREE ) { - m_accessChap = m_main->GetPlayerProgress()->GetChapPassed(LevelCategory::Missions); + m_accessChap = m_main->GetPlayerProfile()->GetChapPassed(LevelCategory::Missions); } pos.x = 0.10f; @@ -782,7 +782,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = dim.x*6.5f; pli = pw->CreateList(pos, ddim, 0, EVENT_INTERFACE_CHAP); pli->SetState(STATE_SHADOW); - m_chap[m_category] = m_main->GetPlayerProgress()->GetSelectedChap(m_category)-1; + m_chap[m_category] = m_main->GetPlayerProfile()->GetSelectedChap(m_category)-1; UpdateSceneChap(m_chap[m_category]); if ( m_phase != PHASE_USER ) pli->SetState(STATE_EXTEND); @@ -805,7 +805,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = dim.x*6.5f; pli = pw->CreateList(pos, ddim, 0, EVENT_INTERFACE_LIST); pli->SetState(STATE_SHADOW); - m_sel[m_category] = m_main->GetPlayerProgress()->GetSelectedRank(m_category)-1; + m_sel[m_category] = m_main->GetPlayerProfile()->GetSelectedRank(m_category)-1; UpdateSceneList(m_chap[m_category], m_sel[m_category]); if ( m_phase != PHASE_USER ) pli->SetState(STATE_EXTEND); pos = pli->GetPos(); @@ -2078,7 +2078,7 @@ bool CMainDialog::EventProcess(const Event &event) if ( m_phase == PHASE_PERSO ) { - PlayerApperance& apperance = m_main->GetPlayerProgress()->GetApperance(); + PlayerApperance& apperance = m_main->GetPlayerProfile()->GetApperance(); switch( event.type ) { case EVENT_KEY_DOWN: @@ -2184,12 +2184,12 @@ bool CMainDialog::EventProcess(const Event &event) break; case EVENT_INTERFACE_POK: - m_main->GetPlayerProgress()->SaveApperance(); + m_main->GetPlayerProfile()->SaveApperance(); m_main->ChangePhase(PHASE_INIT); break; case EVENT_INTERFACE_PCANCEL: - m_main->GetPlayerProgress()->LoadApperance(); // reload apperance from file + m_main->GetPlayerProfile()->LoadApperance(); // reload apperance from file m_main->ChangePhase(PHASE_NAME); break; @@ -2229,7 +2229,7 @@ bool CMainDialog::EventProcess(const Event &event) pl = static_cast(pw->SearchControl(EVENT_INTERFACE_CHAP)); if ( pl == 0 ) break; m_chap[m_category] = pl->GetSelect(); - m_main->GetPlayerProgress()->SetSelectedChap(m_category, m_chap[m_category]+1); + m_main->GetPlayerProfile()->SetSelectedChap(m_category, m_chap[m_category]+1); UpdateSceneList(m_chap[m_category], m_sel[m_category]); UpdateSceneResume(m_chap[m_category]+1, m_sel[m_category]+1); break; @@ -2238,7 +2238,7 @@ bool CMainDialog::EventProcess(const Event &event) pl = static_cast(pw->SearchControl(EVENT_INTERFACE_LIST)); if ( pl == 0 ) break; m_sel[m_category] = pl->GetSelect(); - m_main->GetPlayerProgress()->SetSelectedRank(m_category, m_sel[m_category]+1); + m_main->GetPlayerProfile()->SetSelectedRank(m_category, m_sel[m_category]+1); UpdateSceneResume(m_chap[m_category]+1, m_sel[m_category]+1); break; @@ -3389,7 +3389,7 @@ void CMainDialog::UpdateNameControl() pe = static_cast(pw->SearchControl(EVENT_INTERFACE_NEDIT)); if ( pe == 0 ) return; - std::string gamer = m_main->GetPlayerProgress()->GetName(); + std::string gamer = m_main->GetPlayerProfile()->GetName(); total = pl->GetTotal(); sel = pl->GetSelect(); pe->GetText(name, 100); @@ -3589,7 +3589,7 @@ void CMainDialog::NameDelete() char* gamer = pl->GetItemName(sel); m_main->SelectPlayer(gamer); - if (!m_main->GetPlayerProgress()->Delete()) + if (!m_main->GetPlayerProfile()->Delete()) { m_sound->Play(SOUND_TZOING); return; @@ -3626,7 +3626,7 @@ void CMainDialog::UpdatePerso() std::string name; int i; - PlayerApperance& apperance = m_main->GetPlayerProgress()->GetApperance(); + PlayerApperance& apperance = m_main->GetPlayerProfile()->GetApperance(); pw = static_cast(m_interface->SearchControl(EVENT_WINDOW5)); if ( pw == 0 ) return; @@ -3793,7 +3793,7 @@ void CMainDialog::CameraPerso() void CMainDialog::FixPerso(int rank, int index) { - PlayerApperance& apperance = m_main->GetPlayerProgress()->GetApperance(); + PlayerApperance& apperance = m_main->GetPlayerProfile()->GetApperance(); if ( m_apperanceTab == 0 ) { if ( index == 1 ) @@ -3828,7 +3828,7 @@ void CMainDialog::ColorPerso() CSlider* ps; Gfx::Color color; - PlayerApperance& apperance = m_main->GetPlayerProgress()->GetApperance(); + PlayerApperance& apperance = m_main->GetPlayerProfile()->GetApperance(); pw = static_cast(m_interface->SearchControl(EVENT_WINDOW5)); if ( pw == 0 ) return; @@ -3858,7 +3858,7 @@ void CMainDialog::ColorPerso() bool CMainDialog::IsIOReadScene() { - std::string userSaveDir = m_savegameDir + "/" + m_main->GetPlayerProgress()->GetName(); + std::string userSaveDir = m_savegameDir + "/" + m_main->GetPlayerProfile()->GetName(); auto saveDirs = CResourceManager::ListDirectories(userSaveDir); for (auto dir : saveDirs) { @@ -3922,7 +3922,7 @@ void CMainDialog::IOReadList() m_saveList.clear(); - std::string userSaveDir = m_savegameDir + "/" + m_main->GetPlayerProgress()->GetName(); + std::string userSaveDir = m_savegameDir + "/" + m_main->GetPlayerProfile()->GetName(); auto saveDirs = CResourceManager::ListDirectories(userSaveDir); //std::sort(saveDirs.begin(), saveDirs.end()); @@ -4087,14 +4087,14 @@ bool CMainDialog::IOWriteScene() pe->GetText(info, 100); if (static_cast(sel) >= m_saveList.size()) { - dir = m_savegameDir + "/" + m_main->GetPlayerProgress()->GetName() + "/save" + clearName(info); + dir = m_savegameDir + "/" + m_main->GetPlayerProfile()->GetName() + "/save" + clearName(info); } else { dir = m_saveList.at(sel); } - m_main->GetPlayerProgress()->SaveScene(dir, info); + m_main->GetPlayerProfile()->SaveScene(dir, info); return true; } @@ -4249,7 +4249,7 @@ void CMainDialog::UpdateSceneChap(int &chap) sprintf(line, "%s", (std::string("[ERROR]: ")+e.what()).c_str()); } - bPassed = m_main->GetPlayerProgress()->GetLevelPassed(m_category, j+1, 0); + bPassed = m_main->GetPlayerProfile()->GetLevelPassed(m_category, j+1, 0); pl->SetItemName(j, line); pl->SetCheck(j, bPassed); pl->SetEnable(j, true); @@ -4320,7 +4320,7 @@ void CMainDialog::UpdateSceneList(int chap, int &sel) sprintf(line, "%s", (std::string("[ERROR]: ")+e.what()).c_str()); } - bPassed = m_main->GetPlayerProgress()->GetLevelPassed(m_category, chap+1, j+1); + bPassed = m_main->GetPlayerProfile()->GetLevelPassed(m_category, chap+1, j+1); pl->SetItemName(j, line); pl->SetCheck(j, bPassed); pl->SetEnable(j, true); @@ -4407,8 +4407,8 @@ void CMainDialog::UpdateSceneResume(int chap, int rank) } else { - numTry = m_main->GetPlayerProgress()->GetLevelTryCount(m_category, chap, rank); - bPassed = m_main->GetPlayerProgress()->GetLevelPassed(m_category, chap, rank); + numTry = m_main->GetPlayerProfile()->GetLevelTryCount(m_category, chap, rank); + bPassed = m_main->GetPlayerProfile()->GetLevelPassed(m_category, chap, rank); bVisible = ( numTry > 2 || bPassed || m_main->GetShowSoluce() ); if ( !GetSoluce4() ) bVisible = false; pc->SetState(STATE_VISIBLE, bVisible); @@ -5898,14 +5898,14 @@ void CMainDialog::UpdateChapterPassed() bool bAll = true; for ( int i=0 ; iGetPlayerProgress()->GetLevelPassed(m_category, m_chap[m_category]+1, i+1)) + if (!m_main->GetPlayerProfile()->GetLevelPassed(m_category, m_chap[m_category]+1, i+1)) { bAll = false; break; } } - m_main->GetPlayerProgress()->IncrementLevelTryCount(m_category, m_chap[m_category]+1, 0); - m_main->GetPlayerProgress()->SetLevelPassed(m_category, m_chap[m_category]+1, 0, bAll); + m_main->GetPlayerProfile()->IncrementLevelTryCount(m_category, m_chap[m_category]+1, 0); + m_main->GetPlayerProfile()->SetLevelPassed(m_category, m_chap[m_category]+1, 0, bAll); } @@ -5921,8 +5921,8 @@ bool CMainDialog::NextMission() m_sel[m_category] = 0; // first mission } - m_main->GetPlayerProgress()->SetSelectedChap(m_category, m_chap[m_category]+1); - m_main->GetPlayerProgress()->SetSelectedRank(m_category, m_sel[m_category]+1); + m_main->GetPlayerProfile()->SetSelectedChap(m_category, m_chap[m_category]+1); + m_main->GetPlayerProfile()->SetSelectedRank(m_category, m_sel[m_category]+1); return true; } diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index 78e846ca..f81bae19 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -35,7 +35,7 @@ #include "object/brain.h" #include "object/object.h" -#include "object/player_progress.h" +#include "object/player_profile.h" #include "script/cbottoken.h" #include "script/script.h" @@ -1583,7 +1583,7 @@ std::string CStudio::SearchDirectory(bool bCreate) } else { - dir = m_main->GetPlayerProgress()->GetSaveFile("program/"); + dir = m_main->GetPlayerProfile()->GetSaveFile("program/"); } if ( bCreate )