diff --git a/Windows/MainWindow.h b/Windows/MainWindow.h index 835d22cb2e..0341e897e7 100644 --- a/Windows/MainWindow.h +++ b/Windows/MainWindow.h @@ -35,8 +35,8 @@ namespace MainWindow FRAMESKIP_8 = 8, FRAMESKIP_MAX = FRAMESKIP_8, - FRAMESKIPTYPE_0 = 0, - FRAMESKIPTYPE_1 = 1, + FRAMESKIPTYPE_COUNT = 0, + FRAMESKIPTYPE_PRCNT = 1, RESOLUTION_AUTO = 0, RESOLUTION_NATIVE = 1, diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index ba25f60bed..aff87ebd21 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -337,7 +337,8 @@ namespace MainWindow { TranslateSubMenu(menu, "Frame Skipping", MENU_OPTIONS, SUBMENU_FRAME_SKIPPING, L"\tF7"); TranslateMenuItem(menu, ID_OPTIONS_FRAMESKIP_AUTO); TranslateMenuItem(menu, ID_OPTIONS_FRAMESKIP_0); - TranslateMenuItem(menu, ID_OPTIONS_FRAMESKIPTYPE_0); + TranslateMenuItem(menu, ID_OPTIONS_FRAMESKIPTYPE_COUNT); + TranslateMenuItem(menu, ID_OPTIONS_FRAMESKIPTYPE_PRCNT); // Skip frameskipping 1-8.. TranslateSubMenu(menu, "Texture Filtering", MENU_OPTIONS, SUBMENU_TEXTURE_FILTERING); TranslateMenuItem(menu, ID_OPTIONS_TEXTUREFILTERING_AUTO); @@ -846,8 +847,8 @@ namespace MainWindow { case ID_OPTIONS_FRAMESKIP_7: setFrameSkipping(FRAMESKIP_7); break; case ID_OPTIONS_FRAMESKIP_8: setFrameSkipping(FRAMESKIP_MAX); break; - case ID_OPTIONS_FRAMESKIPTYPE_0: setFrameSkippingType(FRAMESKIPTYPE_0); break; - case ID_OPTIONS_FRAMESKIPTYPE_1: setFrameSkippingType(FRAMESKIPTYPE_1); break; + case ID_OPTIONS_FRAMESKIPTYPE_COUNT: setFrameSkippingType(FRAMESKIPTYPE_COUNT); break; + case ID_OPTIONS_FRAMESKIPTYPE_PRCNT: setFrameSkippingType(FRAMESKIPTYPE_PRCNT); break; case ID_OPTIONS_FRAMESKIPDUMMY: setFrameSkipping(); @@ -1101,7 +1102,8 @@ namespace MainWindow { CHECKITEM(ID_OPTIONS_SHOWFPS, g_Config.iShowFPSCounter); CHECKITEM(ID_OPTIONS_FRAMESKIP_AUTO, g_Config.bAutoFrameSkip); CHECKITEM(ID_OPTIONS_FRAMESKIP, g_Config.iFrameSkip != FRAMESKIP_OFF); - CHECKITEM(ID_OPTIONS_FRAMESKIPTYPE, g_Config.iFrameSkipType); + CHECKITEM(ID_OPTIONS_FRAMESKIPTYPE_COUNT, g_Config.iFrameSkipType == FRAMESKIPTYPE_COUNT); + CHECKITEM(ID_OPTIONS_FRAMESKIPTYPE_PRCNT, g_Config.iFrameSkipType == FRAMESKIPTYPE_PRCNT); CHECKITEM(ID_OPTIONS_VSYNC, g_Config.bVSync); CHECKITEM(ID_OPTIONS_TOPMOST, g_Config.bTopMost); CHECKITEM(ID_OPTIONS_PAUSE_FOCUS, g_Config.bPauseOnLostFocus); @@ -1276,8 +1278,8 @@ namespace MainWindow { }; static const int frameskippingType[] = { - ID_OPTIONS_FRAMESKIPTYPE_0, - ID_OPTIONS_FRAMESKIPTYPE_1, + ID_OPTIONS_FRAMESKIPTYPE_COUNT, + ID_OPTIONS_FRAMESKIPTYPE_PRCNT, }; if (g_Config.iFrameSkip < FRAMESKIP_OFF) diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index 64ebceda3f..f4cc79c8f1 100644 --- a/Windows/ppsspp.rc +++ b/Windows/ppsspp.rc @@ -591,8 +591,8 @@ BEGIN END POPUP "Frame Skipping Type" BEGIN - MENUITEM "Skip Number of Frames", ID_OPTIONS_FRAMESKIPTYPE_0 - MENUITEM "Skip Percent of FPS", ID_OPTIONS_FRAMESKIPTYPE_1 + MENUITEM "Skip Number of Frames", ID_OPTIONS_FRAMESKIPTYPE_COUNT + MENUITEM "Skip Percent of FPS", ID_OPTIONS_FRAMESKIPTYPE_PRCNT END POPUP "Texture Filtering" BEGIN diff --git a/Windows/resource.h b/Windows/resource.h index 2dddf88dd4..d6394a20bb 100644 --- a/Windows/resource.h +++ b/Windows/resource.h @@ -343,8 +343,8 @@ #define ID_EMULATION_PAUSE 40177 #define ID_HELP_DISCORD 40178 #define IDC_GEDBG_STEPCURVE 40179 -#define ID_OPTIONS_FRAMESKIPTYPE_0 40180 -#define ID_OPTIONS_FRAMESKIPTYPE_1 40181 +#define ID_OPTIONS_FRAMESKIPTYPE_COUNT 40180 +#define ID_OPTIONS_FRAMESKIPTYPE_PRCNT 40181 // Dummy option to let the buffered rendering hotkey cycle through all the options. #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500