ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check game ID against what is recorded to the .dtm

This commit is contained in:
rog 2012-10-24 19:37:51 -04:00
parent 7ee455ce3b
commit 76a6917fdf
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Src/BootManager.cpp
View File

@ -118,7 +118,6 @@ bool BootCore(const std::string& _rFilename)
if (Movie::IsPlayingInput() && Movie::IsConfigSaved()) if (Movie::IsPlayingInput() && Movie::IsConfigSaved())
{ {
Movie::Init();
StartUp.bCPUThread = Movie::IsDualCore(); StartUp.bCPUThread = Movie::IsDualCore();
StartUp.bSkipIdle = Movie::IsSkipIdle(); StartUp.bSkipIdle = Movie::IsSkipIdle();
StartUp.bDSPHLE = Movie::IsDSPHLE(); StartUp.bDSPHLE = Movie::IsDSPHLE();

20
Source/Core/Core/Src/Movie.cpp
View File

@ -135,6 +135,11 @@ void Init()
if (IsPlayingInput()) if (IsPlayingInput())
{ {
ReadHeader(); ReadHeader();
if ((strncmp((char *)tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str(), 6)))
{
PanicAlert("The recorded game (%s) is not the same as the selected game (%s)", tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str());
EndPlayInput(false);
}
} }
if (IsRecordingInput()) if (IsRecordingInput())
{ {
@ -683,19 +688,6 @@ bool PlayInput(const char *filename)
Movie::LoadInput(filename); Movie::LoadInput(filename);
} }
/* TODO: Put this verification somewhere we have the gameID of the played game
// TODO: Replace with Unique ID
if(tmpHeader.uniqueID != 0) {
PanicAlert("Recording Unique ID Verification Failed");
goto cleanup;
}
if(strncmp((char *)tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str(), 6)) {
PanicAlert("The recorded game (%s) is not the same as the selected game (%s)", header.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str());
goto cleanup;
}
*/
ReadHeader(); ReadHeader();
g_totalFrames = tmpHeader.frameCount; g_totalFrames = tmpHeader.frameCount;
g_totalLagCount = tmpHeader.lagCount; g_totalLagCount = tmpHeader.lagCount;
@ -1094,6 +1086,7 @@ void SaveRecording(const char *filename)
header.bMemcard = bMemcard; header.bMemcard = bMemcard;
header.bBlankMC = bBlankMC; header.bBlankMC = bBlankMC;
strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange));
// TODO: prompt the user for author name. It's currently always blank, unless the user manually edits the .dtm file.
strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author));
// TODO // TODO
@ -1141,6 +1134,7 @@ void SetGraphicsConfig()
void GetSettings() void GetSettings()
{ {
bSaveConfig = true;
bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle;
bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread;
bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive;