diff --git a/desmume/src/frontend/windows/hotkey.cpp b/desmume/src/frontend/windows/hotkey.cpp index f7af4959c..b8376f798 100644 --- a/desmume/src/frontend/windows/hotkey.cpp +++ b/desmume/src/frontend/windows/hotkey.cpp @@ -142,11 +142,21 @@ void HK_JitBlockSizeInc(int, bool justPressed) } #endif +void HK_ListCheats(int, bool justPressed) +{ + if (romloaded) + CheatsListDialog(MainWindow->getHWnd()); +} void HK_SearchCheats(int, bool justPressed) { if (romloaded) CheatsSearchDialog(MainWindow->getHWnd()); } +void HK_ToggleCheats(int, bool justPressed) +{ + CommonSettings.cheatsDisable = !CommonSettings.cheatsDisable; + WritePrivateProfileBool("General", "cheatsDisable", CommonSettings.cheatsDisable, IniName); +} static void DoScreenshot(const char* fname) { @@ -752,6 +762,13 @@ void InitCustomKeys (SCustomKeys *keys) keys->LCDsSwap.page = HOTKEY_PAGE_TOOLS; keys->LCDsSwap.key = VK_NEXT; + keys->ListCheats.handleKeyDown = HK_ListCheats; + keys->ListCheats.code = "ListCheats"; + keys->ListCheats.name = STRW(ID_LABEL_HK63); + keys->ListCheats.page = HOTKEY_PAGE_TOOLS; + keys->ListCheats.key = 'L'; + keys->ListCheats.modifiers = CUSTKEY_CTRL_MASK; + keys->SearchCheats.handleKeyDown = HK_SearchCheats; keys->SearchCheats.code = "SearchCheats"; keys->SearchCheats.name = STRW(ID_LABEL_HK54); @@ -759,6 +776,13 @@ void InitCustomKeys (SCustomKeys *keys) keys->SearchCheats.key = 'S'; keys->SearchCheats.modifiers = CUSTKEY_CTRL_MASK; + keys->ToggleCheats.handleKeyDown = HK_ToggleCheats; + keys->ToggleCheats.code = "ToggleCheats"; + keys->ToggleCheats.name = STRW(ID_LABEL_HK64); + keys->ToggleCheats.page = HOTKEY_PAGE_TOOLS; + keys->ToggleCheats.key = 'C'; + keys->ToggleCheats.modifiers = CUSTKEY_CTRL_MASK; + keys->NewLuaScript.handleKeyDown = HK_NewLuaScriptDown; keys->NewLuaScript.code = "NewLuaScript"; keys->NewLuaScript.name = STRW(ID_LABEL_HK26); diff --git a/desmume/src/frontend/windows/hotkey.h b/desmume/src/frontend/windows/hotkey.h index 6a2598c91..8c6fe5fae 100644 --- a/desmume/src/frontend/windows/hotkey.h +++ b/desmume/src/frontend/windows/hotkey.h @@ -101,7 +101,7 @@ struct SCustomKeys SCustomKey LCDsMode; SCustomKey LCDsSwap; - SCustomKey SearchCheats; + SCustomKey ListCheats, SearchCheats, ToggleCheats; SCustomKey NewLuaScript, CloseLuaScripts, MostRecentLuaScript; diff --git a/desmume/src/frontend/windows/resource.h b/desmume/src/frontend/windows/resource.h index 4b7d34741..d8516cfd0 100644 --- a/desmume/src/frontend/windows/resource.h +++ b/desmume/src/frontend/windows/resource.h @@ -842,6 +842,8 @@ #define ID_LABEL_HK60 4525 #define ID_LABEL_HK61 4526 #define ID_LABEL_HK62 4527 +#define ID_LABEL_HK63 4528 +#define ID_LABEL_HK64 4529 #define IDD_MICROPHONE 5000 #define IDM_MICROPHONESETTINGS 5001 #define IDC_MICSAMPLEBROWSE 5003 diff --git a/desmume/src/frontend/windows/resources.rc b/desmume/src/frontend/windows/resources.rc index 93ba06942..508dfdd25 100644 --- a/desmume/src/frontend/windows/resources.rc +++ b/desmume/src/frontend/windows/resources.rc @@ -2229,6 +2229,12 @@ BEGIN ID_LABEL_HK3d "Decrease JIT block size" END +STRINGTABLE +BEGIN + ID_LABEL_HK63 "List Cheats" + ID_LABEL_HK64 "Toggle Cheats" +END + #endif // English (United States) resources /////////////////////////////////////////////////////////////////////////////