Permalink
Browse files

Fixes for Unknown

  • Loading branch information...
mrfixit2001 committed Nov 4, 2018
1 parent c19d3fe commit 42c50a0ab024326469cf12b69377416dafbb7a50
Showing with 14 additions and 12 deletions.
  1. +2 −2 Windows/MainWindow.h
  2. +8 −6 Windows/MainWindowMenu.cpp
  3. +2 −2 Windows/ppsspp.rc
  4. +2 −2 Windows/resource.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,
@@ -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)
@@ -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
@@ -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

0 comments on commit 42c50a0

Please sign in to comment.