From 6461d6237d5c93be8088e905997de0407ce51a50 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Thu, 5 Nov 2015 22:07:35 +0100 Subject: [PATCH] Windows: Remove two fairly useless shortcuts. The rendering mode one was really dangerous, and mapped to F5 which is very easy to accidentally hit when loading save states. --- Windows/MainWindowMenu.cpp | 11 +++-------- Windows/ppsspp.rc | 2 -- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index 848de3ed6e..efe03d47bf 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -273,7 +273,7 @@ namespace MainWindow { TranslateSubMenu(menu, "Backend", MENU_OPTIONS, SUBMENU_RENDERING_BACKEND); TranslateMenuItem(menu, ID_OPTIONS_DIRECTX); TranslateMenuItem(menu, ID_OPTIONS_OPENGL); - TranslateSubMenu(menu, "Rendering Mode", MENU_OPTIONS, SUBMENU_RENDERING_MODE, L"\tF5"); + TranslateSubMenu(menu, "Rendering Mode", MENU_OPTIONS, SUBMENU_RENDERING_MODE); TranslateMenuItem(menu, ID_OPTIONS_NONBUFFEREDRENDERING); TranslateMenuItem(menu, ID_OPTIONS_BUFFEREDRENDERING); TranslateMenuItem(menu, ID_OPTIONS_READFBOTOMEMORYCPU); @@ -298,7 +298,7 @@ namespace MainWindow { TranslateMenuItem(menu, ID_TEXTURESCALING_BICUBIC); TranslateMenuItem(menu, ID_TEXTURESCALING_HYBRID_BICUBIC); TranslateMenuItem(menu, ID_TEXTURESCALING_DEPOSTERIZE); - TranslateMenuItem(menu, ID_OPTIONS_HARDWARETRANSFORM, L"\tF6"); + TranslateMenuItem(menu, ID_OPTIONS_HARDWARETRANSFORM); TranslateMenuItem(menu, ID_OPTIONS_VERTEXCACHE); TranslateMenuItem(menu, ID_OPTIONS_SHOWFPS); TranslateMenuItem(menu, ID_EMULATION_SOUND); @@ -409,7 +409,7 @@ namespace MainWindow { NativeMessageReceived("gpu clear cache", ""); } - static void setRenderingMode(int mode = -1) { + static void setRenderingMode(int mode) { if (mode >= FB_NON_BUFFERED_MODE) g_Config.iRenderingMode = mode; else { @@ -683,11 +683,6 @@ namespace MainWindow { case ID_OPTIONS_READFBOTOMEMORYCPU: setRenderingMode(FB_READFBOMEMORY_CPU); break; case ID_OPTIONS_READFBOTOMEMORYGPU: setRenderingMode(FB_READFBOMEMORY_GPU); break; - // Dummy option to let the buffered rendering hotkey cycle through all the options. - case ID_OPTIONS_BUFFEREDRENDERINGDUMMY: - setRenderingMode(); - break; - case ID_DEBUG_SHOWDEBUGSTATISTICS: g_Config.bShowDebugStats = !g_Config.bShowDebugStats; NativeMessageReceived("clear jit", ""); diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index c063f8999a..dbe6223f5e 100644 --- a/Windows/ppsspp.rc +++ b/Windows/ppsspp.rc @@ -77,9 +77,7 @@ 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_F5, ID_OPTIONS_BUFFEREDRENDERINGDUMMY, VIRTKEY, NOINVERT VK_F7, ID_OPTIONS_FRAMESKIPDUMMY, VIRTKEY, NOINVERT - VK_F6, ID_OPTIONS_HARDWARETRANSFORM, VIRTKEY, NOINVERT VK_F12, ID_DEBUG_TAKESCREENSHOT, VIRTKEY, NOINVERT VK_F8, ID_TOGGLE_PAUSE, VIRTKEY, NOINVERT VK_RETURN, ID_OPTIONS_FULLSCREEN, ALT, VIRTKEY, NOINVERT