From b689d434715bbde0691b97285ecd0d180b1aaa5a Mon Sep 17 00:00:00 2001 From: OV2 Date: Sat, 1 Apr 2023 01:35:02 +0200 Subject: [PATCH] win32: move backdrop hotkey to other visual hotkeys, move superscope turbo to turbo hotkeys --- win32/wlanguage.h | 4 ++-- win32/wsnes9x.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/win32/wlanguage.h b/win32/wlanguage.h index 8bea748e..8577f1a5 100644 --- a/win32/wlanguage.h +++ b/win32/wlanguage.h @@ -100,7 +100,7 @@ Nintendo is a trademark.") #define HOTKEYS_LABEL_2_5 TEXT("Sprites layer:") #define HOTKEYS_LABEL_2_6 TEXT("Clipping Windows:") #define HOTKEYS_LABEL_2_7 TEXT("Transparency:") -#define HOTKEYS_LABEL_2_8 TEXT("SuperScope turbo:") +#define HOTKEYS_LABEL_2_8 TEXT("Toggle backdrop:") #define HOTKEYS_LABEL_2_9 TEXT("SuperScope pause:") #define HOTKEYS_LABEL_2_10 TEXT("Switch controllers:") #define HOTKEYS_LABEL_2_11 TEXT("Joypad swap:") @@ -120,6 +120,7 @@ Nintendo is a trademark.") #define HOTKEYS_LABEL_3_10 TEXT("Turbo Up mode:") #define HOTKEYS_LABEL_3_11 TEXT("Turbo Right mode:") #define HOTKEYS_LABEL_3_12 TEXT("Turbo Down mode:") +#define HOTKEYS_LABEL_3_13 TEXT("SuperScope turbo:") #define HOTKEYS_LABEL_4_1 TEXT("Select Slot 0:") @@ -134,7 +135,6 @@ Nintendo is a trademark.") #define HOTKEYS_LABEL_4_10 TEXT("Select Slot 9:") #define HOTKEYS_LABEL_4_11 TEXT("Save to file:") #define HOTKEYS_LABEL_4_12 TEXT("Load from file:") -#define HOTKEYS_LABEL_4_13 TEXT("Toggle backdrop:") // gaming buttons and axes #define GAMEDEVICE_JOYNUMPREFIX "(J%x)" // don't change this diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index a270acea..47cec321 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -8311,7 +8311,7 @@ static hotkey_dialog_item hotkey_dialog_items[4][MAX_SWITCHABLE_HOTKEY_DIALOG_IT { &CustomKeys.BGL5, HOTKEYS_LABEL_2_5 }, { &CustomKeys.ClippingWindows, HOTKEYS_LABEL_2_6 }, { &CustomKeys.Transparency, HOTKEYS_LABEL_2_7 }, - { &CustomKeys.ScopeTurbo, HOTKEYS_LABEL_2_8 }, + { &CustomKeys.ToggleBackdrop, HOTKEYS_LABEL_2_8 }, { &CustomKeys.ScopePause, HOTKEYS_LABEL_2_9 }, { &CustomKeys.SwitchControllers, HOTKEYS_LABEL_2_10 }, { &CustomKeys.JoypadSwap, HOTKEYS_LABEL_2_11 }, @@ -8332,7 +8332,7 @@ static hotkey_dialog_item hotkey_dialog_items[4][MAX_SWITCHABLE_HOTKEY_DIALOG_IT { &CustomKeys.TurboUp, HOTKEYS_LABEL_3_10 }, { &CustomKeys.TurboRight, HOTKEYS_LABEL_3_11 }, { &CustomKeys.TurboDown, HOTKEYS_LABEL_3_12 }, - { NULL, _T("") }, + { &CustomKeys.ScopeTurbo, HOTKEYS_LABEL_3_13 }, { NULL, _T("") }, }, { @@ -8348,7 +8348,7 @@ static hotkey_dialog_item hotkey_dialog_items[4][MAX_SWITCHABLE_HOTKEY_DIALOG_IT { &CustomKeys.SelectSave[9], HOTKEYS_LABEL_4_10 }, { &CustomKeys.SaveFileSelect, HOTKEYS_LABEL_4_11 }, { &CustomKeys.LoadFileSelect, HOTKEYS_LABEL_4_12 }, - { &CustomKeys.ToggleBackdrop, HOTKEYS_LABEL_4_13 }, + { NULL, _T("") }, { NULL, _T("") }, }, };