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

[Save State] Compare 64DD save state header more proper

This commit is contained in:
LuigiBlood 2020-06-19 21:37:08 +02:00
parent 9f3bab30b9
commit 4205f989a4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Project64-core/N64System/N64Class.cpp
View File

@ -2003,8 +2003,8 @@ bool CN64System::LoadState(const char * FileName)
if (g_Settings->LoadBool(Setting_EnableDisk) && g_Disk) if (g_Settings->LoadBool(Setting_EnableDisk) && g_Disk)
{ {
//Base ROM Information (64DD IPL / Compatible Game ROM) & Disk Info Check //Base ROM Information (64DD IPL / Compatible Game ROM) & Disk Info Check
if (memcmp(LoadHeader, &g_Rom->GetRomAddress()[0x10], 0x20) != 0 && if ((memcmp(LoadHeader, &g_Rom->GetRomAddress()[0x10], 0x20) != 0 ||
memcmp(&LoadHeader[0x20], g_Disk->GetDiskAddressID(), 0x20) != 0 && memcmp(&LoadHeader[0x20], g_Disk->GetDiskAddressID(), 0x20) != 0) &&
!g_Notify->AskYesNoQuestion(g_Lang->GetString(MSG_SAVE_STATE_HEADER).c_str())) !g_Notify->AskYesNoQuestion(g_Lang->GetString(MSG_SAVE_STATE_HEADER).c_str()))
{ {
return false; return false;
@ -2098,8 +2098,8 @@ bool CN64System::LoadState(const char * FileName)
if (g_Settings->LoadBool(Setting_EnableDisk) && g_Disk) if (g_Settings->LoadBool(Setting_EnableDisk) && g_Disk)
{ {
//Base ROM Information (64DD IPL / Compatible Game ROM) & Disk Info Check //Base ROM Information (64DD IPL / Compatible Game ROM) & Disk Info Check
if (memcmp(LoadHeader, &g_Rom->GetRomAddress()[0x10], 0x20) != 0 && if ((memcmp(LoadHeader, &g_Rom->GetRomAddress()[0x10], 0x20) != 0 ||
memcmp(&LoadHeader[0x20], g_Disk->GetDiskAddressID(), 0x20) != 0 && memcmp(&LoadHeader[0x20], g_Disk->GetDiskAddressID(), 0x20) != 0) &&
!g_Notify->AskYesNoQuestion(g_Lang->GetString(MSG_SAVE_STATE_HEADER).c_str())) !g_Notify->AskYesNoQuestion(g_Lang->GetString(MSG_SAVE_STATE_HEADER).c_str()))
{ {
return false; return false;