From 314d286e37864143fd782fee18f8a7e3c74215da Mon Sep 17 00:00:00 2001 From: papel Date: Tue, 9 Jul 2013 21:54:42 -0300 Subject: [PATCH] Changed pause and speed shortcuts. Fixed disabled run on load. --- Common/KeyMap.cpp | 2 +- Windows/WndMainWindow.cpp | 8 ++++++++ Windows/ppsspp.rc | Bin 39042 -> 39042 bytes 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index 9227cf8b8f..f8ef4e2807 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -51,7 +51,7 @@ struct DefaultKeyMap { m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_L)] = VIRTKEY_AXIS_X_MAX; m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_SHIFT_LEFT)] = VIRTKEY_RAPID_FIRE; m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_TAB)] = VIRTKEY_UNTHROTTLE; - m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_F1)] = VIRTKEY_SPEED_TOGGLE; + m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_GRAVE)] = VIRTKEY_SPEED_TOGGLE; m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_ESCAPE)] = VIRTKEY_PAUSE; return m; } diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 6ff9da83ed..b4ae0a8fc7 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -1074,6 +1074,14 @@ namespace MainWindow UINT ingameEnable = globalUIState == UISTATE_INGAME ? MF_ENABLED : MF_GRAYED; EnableMenuItem(menu,ID_TOGGLE_PAUSE, ingameEnable); + if (globalUIState == UISTATE_INGAME) + { + if (Core_IsStepping()) + ModifyMenu(menu, ID_TOGGLE_PAUSE, MF_BYCOMMAND | MF_STRING, ID_TOGGLE_PAUSE, "Run\tF8"); + else + ModifyMenu(menu, ID_TOGGLE_PAUSE, MF_BYCOMMAND | MF_STRING, ID_TOGGLE_PAUSE, "Pause\tF8"); + } + EnableMenuItem(menu,ID_EMULATION_STOP, ingameEnable); EnableMenuItem(menu,ID_EMULATION_RESET, ingameEnable); diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index 201519bee50c3605ffcda292b2ccb92de20f60a6..46064d2bad0e68080248fa5d833c34eeec96e449 100644 GIT binary patch delta 49 zcmZqL$keovX~P6zW;X_l$%TTln>Pq&`0@rZlrrQo#4waFfP@_@bSE#UiWTw)uo`fUjr(Ln1>dLoq`tLkvR+1C%#8aEkWi M4Z;$e3lfFQ0h8bp*#H0l