mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-31 00:32:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Movie: Put Wii s_bClearSave handling in a more logical place

Browse Source
This commit is contained in:
JosJuice 2017-01-08 16:42:57 +01:00
parent 88e0a5e418
commit 6aa41ebc55
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/IOS/ES/ES.cpp
View File

@ -1317,15 +1317,8 @@ u32 ES::ES_DIVerify(const std::vector<u8>& tmd)
File::CreateFullPath(Common::GetTitleDataPath(tmd_title_id, Common::FROM_SESSION_ROOT)); File::CreateFullPath(Common::GetTitleDataPath(tmd_title_id, Common::FROM_SESSION_ROOT));
std::string save_path = Common::GetTitleDataPath(tmd_title_id, Common::FROM_SESSION_ROOT); std::string save_path = Common::GetTitleDataPath(tmd_title_id, Common::FROM_SESSION_ROOT);
if (Movie::IsRecordingInput())
{
// TODO: Check for the actual save data
if (File::Exists(save_path + "banner.bin"))
Movie::SetClearSave(false);
else
Movie::SetClearSave(true);
}
// TODO: There's not supposed to be a whole load of Movie code in IOS HLE.
// TODO: Force the game to save to another location, instead of moving the user's save. // TODO: Force the game to save to another location, instead of moving the user's save.
if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsStartingFromClearSave()) if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsStartingFromClearSave())
{ {

21
Source/Core/Core/Movie.cpp
View File

@ -374,11 +374,6 @@ u64 GetTotalLagCount()
return s_totalLagCount; return s_totalLagCount;
} }
void SetClearSave(bool enabled)
{
s_bClearSave = enabled;
}
void SignalDiscChange(const std::string& new_path) void SignalDiscChange(const std::string& new_path)
{ {
if (Movie::IsRecordingInput()) if (Movie::IsRecordingInput())
@ -573,19 +568,6 @@ bool BeginRecordingInput(int controllers)
State::SaveAs(save_path); State::SaveAs(save_path);
s_bRecordingFromSaveState = true; s_bRecordingFromSaveState = true;
// This is only done here if starting from save state because otherwise we won't have the
// titleid. Otherwise it's set in IOS::HLE::Device::ES.
// TODO: find a way to GetTitleDataPath() from Movie::Init()
// TODO: This comment is out of date. The title ID is no longer set in IOS::HLE::Device::ES
if (SConfig::GetInstance().bWii)
{
if (File::Exists(Common::GetTitleDataPath(SConfig::GetInstance().m_title_id,
Common::FROM_SESSION_ROOT) +
"banner.bin"))
Movie::s_bClearSave = false;
else
Movie::s_bClearSave = true;
}
std::thread md5thread(GetMD5); std::thread md5thread(GetMD5);
md5thread.detach(); md5thread.detach();
GetSettings(); GetSettings();
@ -1487,6 +1469,9 @@ void GetSettings()
s_bNetPlay = NetPlay::IsNetPlayRunning(); s_bNetPlay = NetPlay::IsNetPlayRunning();
if (SConfig::GetInstance().bWii) if (SConfig::GetInstance().bWii)
{ {
u64 title_id = SConfig::GetInstance().m_title_id;
s_bClearSave =
!File::Exists(Common::GetTitleDataPath(title_id, Common::FROM_SESSION_ROOT) + "banner.bin");
s_language = SConfig::GetInstance().m_wii_language; s_language = SConfig::GetInstance().m_wii_language;
} }
else else

1
Source/Core/Core/Movie.h
View File

@ -129,7 +129,6 @@ u64 GetTotalInputCount();
u64 GetCurrentLagCount(); u64 GetCurrentLagCount();
u64 GetTotalLagCount(); u64 GetTotalLagCount();
void SetClearSave(bool enabled);
void SignalDiscChange(const std::string& new_path); void SignalDiscChange(const std::string& new_path);
void SetReset(bool reset); void SetReset(bool reset);