Fix frameskip in Windows UI

This commit is contained in:
papel 2013-09-04 21:37:41 -03:00
parent 649ba06b37
commit 2e48f5d32b
4 changed files with 16 additions and 10 deletions

View File

@ -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,

View File

@ -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,

Binary file not shown.

Binary file not shown.