diff --git a/Source/Project64-core/Settings.cpp b/Source/Project64-core/Settings.cpp index 7fe998cba..fff19894a 100644 --- a/Source/Project64-core/Settings.cpp +++ b/Source/Project64-core/Settings.cpp @@ -118,10 +118,14 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Setting_AutoZipInstantSave, new CSettingTypeApplication("Settings", "Auto Zip Saves", (uint32_t)true)); AddHandler(Setting_EraseGameDefaults, new CSettingTypeApplication("Settings", "Erase on default", (uint32_t)true)); AddHandler(Setting_CheckEmuRunning, new CSettingTypeApplication("Settings", "Check Running", (uint32_t)true)); +#ifndef _M_X64 AddHandler(Setting_ForceInterpreterCPU, new CSettingTypeApplication("Settings", "Force Interpreter CPU", false)); +#else + AddHandler(Setting_ForceInterpreterCPU, new CSettingTypeApplication("Settings", "Force Interpreter CPU", true)); +#endif AddHandler(Setting_FixedRdramAddress, new CSettingTypeApplication("Settings", "Fixed Rdram Address", (uint32_t)0)); - AddHandler(Setting_Enhancement, new CSettingTypeApplication("Settings", "Enable Enhancement", (uint32_t)false)); - + AddHandler(Setting_Enhancement, new CSettingTypeApplication("Settings", "Enable Enhancement", (uint32_t)false)); + AddHandler(Setting_RememberCheats, new CSettingTypeApplication("Settings", "Remember Cheats", (uint32_t)false)); #ifdef ANDROID AddHandler(Setting_UniqueSaveDir, new CSettingTypeTempBool(true)); diff --git a/Source/RSP/Main.cpp b/Source/RSP/Main.cpp index 1557eba80..b007bb46a 100644 --- a/Source/RSP/Main.cpp +++ b/Source/RSP/Main.cpp @@ -766,7 +766,11 @@ EXPORT void EnableDebugging(Boolean Enabled) EXPORT void PluginLoaded(void) { BreakOnStart = false; +#ifndef _M_X64 CPUCore = RecompilerCPU; +#else + CPUCore = InterpreterCPU; +#endif LogRDP = FALSE; LogX86Code = FALSE; Profiling = FALSE;