Merge pull request #19911 from hrydgard/remove-frameskipping-hotkey

Windows: Delete obsolete hardcoded F7 hotkey for frameskipping
hrydgard · Jan 23, 2025 · 858077f · 858077f
2 parents 93dced1 + a45dad9
commit 858077f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
@@ -754,11 +754,6 @@ namespace MainWindow {
 		case ID_OPTIONS_FRAMESKIPTYPE_COUNT:    setFrameSkippingType(FRAMESKIPTYPE_COUNT); break;
 		case ID_OPTIONS_FRAMESKIPTYPE_PRCNT:    setFrameSkippingType(FRAMESKIPTYPE_PRCNT); break;
 
-		case ID_OPTIONS_FRAMESKIPDUMMY:
-			setFrameSkipping();
-			setFrameSkippingType();
-			break;
-
 		case ID_FILE_EXIT:
 			PostMessage(hWnd, WM_CLOSE, 0, 0);
 			break;

diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
@@ -69,7 +69,6 @@ BEGIN
     VK_F2,          ID_FILE_QUICKSAVESTATE_HC, VIRTKEY, NOINVERT
     VK_F4,          ID_FILE_QUICKLOADSTATE_HC, VIRTKEY, NOINVERT
     "1",            ID_OPTIONS_RESOLUTIONDUMMY,    VIRTKEY, CONTROL, NOINVERT
-    VK_F7,          ID_OPTIONS_FRAMESKIPDUMMY, VIRTKEY, NOINVERT
     VK_F12,         ID_DEBUG_TAKESCREENSHOT,  VIRTKEY, NOINVERT
     VK_F8,          ID_TOGGLE_BREAK,        VIRTKEY, NOINVERT
     VK_RETURN,      ID_OPTIONS_FULLSCREEN,  ALT, VIRTKEY, NOINVERT

diff --git a/Windows/resource.h b/Windows/resource.h
@@ -210,7 +210,6 @@
 #define ID_OPTIONS_FRAMESKIP_7           40086
 #define ID_OPTIONS_FRAMESKIP_8           40087
 #define ID_OPTIONS_FRAMESKIP_AUTO        40088
-#define ID_OPTIONS_FRAMESKIPDUMMY        40089
 #define ID_OPTIONS_RESOLUTIONDUMMY       40090
 #define ID_DISASM_ASSEMBLE               40091
 #define ID_DISASM_ADDNEWBREAKPOINT       40092