From 81433e75299ff0714ebc83ef74becc6cfd084200 Mon Sep 17 00:00:00 2001 From: Emmet Young Date: Mon, 1 Apr 2013 03:10:54 +1100 Subject: [PATCH 1/3] Stop the "About INI Files" from crashing when no language was actually loaded in. (Certain ID's were never properly set to anything) --- Source/Project64/Multilanguage/Language Class.cpp | 5 +++++ Source/Project64/User Interface/Gui Class.cpp | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 7a179858e..8c80675c3 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -27,6 +27,11 @@ void CLanguage::LoadDefaultStrings (void) DEF_STR(INI_CURRENT_RDX, "Extended Rom Info (.RDX)"); DEF_STR(INI_TITLE, "About INI Files" ); + DEF_STR(LANGUAGE_NAME, "" ); + DEF_STR(LANGUAGE_AUTHOR, "" ); + DEF_STR(LANGUAGE_VERSION, "" ); + DEF_STR(LANGUAGE_DATE, "" ); + /********************************************************************************* * Numbers * *********************************************************************************/ diff --git a/Source/Project64/User Interface/Gui Class.cpp b/Source/Project64/User Interface/Gui Class.cpp index 128539912..cdb277931 100644 --- a/Source/Project64/User Interface/Gui Class.cpp +++ b/Source/Project64/User Interface/Gui Class.cpp @@ -166,7 +166,6 @@ DWORD CALLBACK AboutIniBoxProc (WND_HANDLE WndHandle, DWORD uMsg, DWORD wParam, char String[200],String2[200]; SetWindowText(hDlg, GS(INI_TITLE)); - //Language SetDlgItemText(hDlg,IDC_LAN,GS(INI_CURRENT_LANG)); sprintf(String,"%s: %s",GS(INI_AUTHOR),GS(LANGUAGE_AUTHOR)); @@ -181,7 +180,7 @@ DWORD CALLBACK AboutIniBoxProc (WND_HANDLE WndHandle, DWORD uMsg, DWORD wParam, EnableWindow(GetDlgItem(hDlg,IDC_LAN_VERSION),FALSE); EnableWindow(GetDlgItem(hDlg,IDC_LAN_DATE),FALSE); } - + //RDB stdstr IniFile = g_Settings->LoadString(SupportFile_RomDatabase).c_str(); SetDlgItemText(hDlg,IDC_RDB,GS(INI_CURRENT_RDB)); From 21dc19972ea48e627befe26ef0d3a4c26a3c8d40 Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 1 Apr 2013 09:30:03 +1100 Subject: [PATCH 2/3] Add blank rdb file --- Config/Blank Project64.rdb | 1 + 1 file changed, 1 insertion(+) create mode 100644 Config/Blank Project64.rdb diff --git a/Config/Blank Project64.rdb b/Config/Blank Project64.rdb new file mode 100644 index 000000000..0dddd5c11 --- /dev/null +++ b/Config/Blank Project64.rdb @@ -0,0 +1 @@ +// empty rdb file (leave at root of emulator so 1.6 plugins work) From 1abb082eef8847641d72bf805b163410bbadfdab Mon Sep 17 00:00:00 2001 From: Emmet Young Date: Mon, 1 Apr 2013 13:25:51 +1100 Subject: [PATCH 3/3] If debugger isn't enabled but where still attempting to start the sync cores, reset to recompiler to stop people from accidentally launching sync cores. --- Source/Project64/N64 System/N64 Class.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp index 3e0d65e04..43ad8ff90 100644 --- a/Source/Project64/N64 System/N64 Class.cpp +++ b/Source/Project64/N64 System/N64 Class.cpp @@ -286,6 +286,13 @@ void CN64System::StartEmulation2 ( bool NewThread ) CInterpreterCPU::BuildCPU(); DWORD CpuType = g_Settings->LoadDword(Game_CpuType); + + if(CpuType == CPU_SyncCores && !g_Settings->LoadBool(Debugger_Enabled)) + { + g_Settings->SaveDword(Game_CpuType, CPU_Recompiler); + CpuType = CPU_Recompiler; + } + if (CpuType == CPU_SyncCores) { g_Notify->DisplayMessage(5,"Copy Plugins");