From 2e48f5d32bcf20398ebf3764b30fb4e971f2b940 Mon Sep 17 00:00:00 2001 From: papel Date: Wed, 4 Sep 2013 21:37:41 -0300 Subject: [PATCH] Fix frameskip in Windows UI --- Windows/WndMainWindow.cpp | 11 ++++++++--- Windows/WndMainWindow.h | 15 ++++++++------- Windows/ppsspp.rc | Bin 44182 -> 44304 bytes Windows/resource.h | Bin 23654 -> 11874 bytes 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index aa2efe376..6d9e10b49 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -414,7 +414,7 @@ namespace MainWindow TranslateMenuItem(ID_FILE_QUICKSAVESTATE, desktopUI, false, false, L"\tF2"); TranslateMenuItem(ID_FILE_LOADSTATEFILE, desktopUI, false, false); TranslateMenuItem(ID_FILE_SAVESTATEFILE, desktopUI, false, false); - TranslateMenuItem(ID_FILE_EXIT, desktopUI); + TranslateMenuItem(ID_FILE_EXIT, desktopUI, true, false, L"\tAlt+F4"); // Emulation menu bool isPaused = Core_IsStepping() && globalUIState == UISTATE_INGAME; @@ -556,10 +556,10 @@ namespace MainWindow memset(message, 0, sizeof(message)); switch(g_Config.iFrameSkip) { - case 0: + case FRAMESKIP_OFF: sprintf(message, "%s: %s", frameskipStr, offStr); break; - case 1: + case FRAMESKIP_AUTO: sprintf(message, "%s: %s", frameskipStr, autoStr); break; default: @@ -1164,6 +1164,10 @@ namespace MainWindow setFrameSkipping(FRAMESKIP_AUTO); break; + case ID_OPTIONS_FRAMESKIP_1: + setFrameSkipping(FRAMESKIP_1); + break; + case ID_OPTIONS_FRAMESKIP_2: setFrameSkipping(FRAMESKIP_2); break; @@ -1669,6 +1673,7 @@ namespace MainWindow static const int frameskipping[] = { ID_OPTIONS_FRAMESKIP_0, ID_OPTIONS_FRAMESKIP_AUTO, + ID_OPTIONS_FRAMESKIP_1, ID_OPTIONS_FRAMESKIP_2, ID_OPTIONS_FRAMESKIP_3, ID_OPTIONS_FRAMESKIP_4, diff --git a/Windows/WndMainWindow.h b/Windows/WndMainWindow.h index b5c2e24fb..1723a77c2 100644 --- a/Windows/WndMainWindow.h +++ b/Windows/WndMainWindow.h @@ -17,13 +17,14 @@ namespace MainWindow enum { FRAMESKIP_OFF = 0, FRAMESKIP_AUTO = 1, - FRAMESKIP_2 = 2, - FRAMESKIP_3 = 3, - FRAMESKIP_4 = 4, - FRAMESKIP_5 = 5, - FRAMESKIP_6 = 6, - FRAMESKIP_7 = 7, - FRAMESKIP_8 = 8, + FRAMESKIP_1 = 2, + FRAMESKIP_2 = 3, + FRAMESKIP_3 = 4, + FRAMESKIP_4 = 5, + FRAMESKIP_5 = 6, + FRAMESKIP_6 = 7, + FRAMESKIP_7 = 8, + FRAMESKIP_8 = 9, FRAMESKIP_MAX = FRAMESKIP_8, ZOOM_NATIVE = 1, diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index 46edb0cbc349ea24bf6d044a480fdf30bfc8ee4d..cc3796a77120a8b7ef9580900b6b9e0a60bbc0df 100644 GIT binary patch delta 54 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