diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index fe332b4051..f731cad7ed 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -229,6 +229,7 @@ bool BootCore(const std::string& _rFilename) StartUp.bSkipIdle = Movie::IsSkipIdle(); StartUp.bDSPHLE = Movie::IsDSPHLE(); StartUp.bProgressive = Movie::IsProgressive(); + StartUp.bPAL60 = Movie::IsPAL60(); StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed(); StartUp.iCPUCore = Movie::GetCPUMode(); StartUp.bSyncGPU = Movie::IsSyncGPU(); diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 33091c7614..9d7e437592 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -63,7 +63,9 @@ static u64 s_totalLagCount = 0; // just stats u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats static u64 s_totalTickCount = 0, s_tickCountAtLastInput = 0; // just stats static u64 s_recordingStartTime; // seconds since 1970 that recording started -static bool s_bSaveConfig = false, s_bSkipIdle = false, s_bDualCore = false, s_bProgressive = false, s_bDSPHLE = false, s_bFastDiscSpeed = false; +static bool s_bSaveConfig = false, s_bSkipIdle = false, s_bDualCore = false; +static bool s_bProgressive = false, s_bPAL60 = false; +static bool s_bDSPHLE = false, s_bFastDiscSpeed = false; static bool s_bSyncGPU = false, s_bNetPlay = false; static std::string s_videoBackend = "unknown"; static int s_iCPUCore = 1; @@ -361,6 +363,11 @@ bool IsProgressive() return s_bProgressive; } +bool IsPAL60() +{ + return s_bPAL60; +} + bool IsSkipIdle() { return s_bSkipIdle; @@ -789,6 +796,7 @@ void ReadHeader() s_bSkipIdle = tmpHeader.bSkipIdle; s_bDualCore = tmpHeader.bDualCore; s_bProgressive = tmpHeader.bProgressive; + s_bPAL60 = tmpHeader.bPAL60; s_bDSPHLE = tmpHeader.bDSPHLE; s_bFastDiscSpeed = tmpHeader.bFastDiscSpeed; s_iCPUCore = tmpHeader.CPUCore; @@ -1211,6 +1219,7 @@ void SaveRecording(const std::string& filename) header.bSkipIdle = s_bSkipIdle; header.bDualCore = s_bDualCore; header.bProgressive = s_bProgressive; + header.bPAL60 = s_bPAL60; header.bDSPHLE = s_bDSPHLE; header.bFastDiscSpeed = s_bFastDiscSpeed; strncpy((char *)header.videoBackend, s_videoBackend.c_str(),ArraySize(header.videoBackend)); @@ -1290,6 +1299,7 @@ void GetSettings() s_bSkipIdle = SConfig::GetInstance().bSkipIdle; s_bDualCore = SConfig::GetInstance().bCPUThread; s_bProgressive = SConfig::GetInstance().bProgressive; + s_bPAL60 = SConfig::GetInstance().bPAL60; s_bDSPHLE = SConfig::GetInstance().bDSPHLE; s_bFastDiscSpeed = SConfig::GetInstance().bFastDiscSpeed; s_videoBackend = g_video_backend->GetName(); diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h index 6c9be3f279..e86b5cb8e2 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -101,7 +101,8 @@ struct DTMHeader u8 bongos; bool bSyncGPU; bool bNetPlay; - u8 reserved[13]; // Padding for any new config options + bool bPAL60; + u8 reserved[12]; // Padding for any new config options u8 discChange[40]; // Name of iso file to switch to, for two disc games. u8 revision[20]; // Git hash u32 DSPiromHash; @@ -131,6 +132,7 @@ u64 GetRecordingStartTime(); bool IsConfigSaved(); bool IsDualCore(); bool IsProgressive(); +bool IsPAL60(); bool IsSkipIdle(); bool IsDSPHLE(); bool IsFastDiscSpeed();