diff --git a/win32/rsrc/resource.h b/win32/rsrc/resource.h index b896f5e0..0caf1368 100644 --- a/win32/rsrc/resource.h +++ b/win32/rsrc/resource.h @@ -101,7 +101,7 @@ #define IDC_MULTICART_EDITB 1092 #define IDC_PAUSESPIN 1093 #define IDC_DWNRIGHT 1093 -#define IDC_SHADER_GLSL_FILE 1093 +#define IDC_SHADER_GLSL_FILE 1093 #define IDC_SYNCBYRESET 1094 #define IDC_DOWN 1094 #define IDC_SENDROM 1095 @@ -349,7 +349,7 @@ #define IDC_SHADER_ENABLED 3015 #define IDC_SHADER_HLSL_BROWSE 3016 #define IDC_SHADER_GROUP 3017 -#define IDC_SHADER_GLSL_BROWSE 3018 +#define IDC_SHADER_GLSL_BROWSE 3018 #define ID_FILE_EXIT 40001 #define ID_WINDOW_HIDEMENUBAR 40004 #define ID_FILE_AVI_RECORDING 40005 @@ -475,13 +475,14 @@ #define ID_SOUND_194MS 40165 #define ID_SOUND_210MS 40166 #define ID_EMULATION_PAUSEWHENINACTIVE 40167 +#define ID_VIDEO_SHOWFRAMERATE 40168 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 151 -#define _APS_NEXT_COMMAND_VALUE 40168 +#define _APS_NEXT_COMMAND_VALUE 40169 #define _APS_NEXT_CONTROL_VALUE 3018 #define _APS_NEXT_SYMED_VALUE 101 #endif diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc index 5867cb9c..7c42fbd0 100644 --- a/win32/rsrc/snes9x.rc +++ b/win32/rsrc/snes9x.rc @@ -34,7 +34,7 @@ IDC_CURSOR_SCOPE CURSOR "nodrop.cur" IDR_SNES9X_ACCELERATORS ACCELERATORS BEGIN - "E", ID_CHEAT_ENTER, VIRTKEY, ALT, NOINVERT + "G", ID_CHEAT_ENTER, VIRTKEY, ALT, NOINVERT "A", ID_CHEAT_SEARCH, VIRTKEY, ALT, NOINVERT "O", ID_FILE_LOAD_GAME, VIRTKEY, CONTROL, NOINVERT VK_F5, ID_OPTIONS_DISPLAY, VIRTKEY, ALT, NOINVERT @@ -872,7 +872,7 @@ BEGIN MENUITEM "&Pause", ID_FILE_PAUSE MENUITEM "Pause &When Inactive", ID_EMULATION_PAUSEWHENINACTIVE MENUITEM SEPARATOR - MENUITEM "Se&ttings...\tAlt+F8", ID_OPTIONS_SETTINGS + MENUITEM "&Settings...\tAlt+F8", ID_OPTIONS_SETTINGS END POPUP "&Input" BEGIN @@ -947,12 +947,13 @@ BEGIN MENUITEM "&Stretch Image\tAlt+Backspace", 40032 MENUITEM "&Maintain Aspect Ratio", 40123 MENUITEM "&Bilinear Filtering", ID_WINDOW_VIDMEM + MENUITEM "Show Frame &Rate", ID_VIDEO_SHOWFRAMERATE MENUITEM SEPARATOR MENUITEM "&Display Configuration...\tAlt+F5", ID_OPTIONS_DISPLAY END POPUP "&Cheat" BEGIN - MENUITEM "&Game Genie, Pro-Action Replay Codes\tAlt+E", ID_CHEAT_ENTER + MENUITEM "&Game Genie, Pro-Action Replay Codes\tAlt+G", ID_CHEAT_ENTER MENUITEM "&Search for New Cheats", ID_CHEAT_SEARCH_MODAL MENUITEM "Search for New Cheats (active)\tAlt+A", 40064 MENUITEM "&Apply Cheats", ID_CHEAT_APPLY, CHECKED diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index 6e0ce83b..205bf2f6 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -2077,6 +2077,9 @@ LRESULT CALLBACK WinProc( GetClientRect (GUI.hWnd, &rect); InvalidateRect (GUI.hWnd, &rect, true); } break; + case ID_VIDEO_SHOWFRAMERATE: + Settings.DisplayFrameRate = !Settings.DisplayFrameRate; + break; case ID_SAVESCREENSHOT: Settings.TakeScreenshot=true; break; @@ -3596,6 +3599,9 @@ static void CheckMenuStates () mii.fState |= MFS_DISABLED; SetMenuItemInfo (GUI.hMenu, ID_WINDOW_VIDMEM, FALSE, &mii); + mii.fState = Settings.DisplayFrameRate ? MFS_CHECKED : MFS_UNCHECKED; + SetMenuItemInfo (GUI.hMenu, ID_VIDEO_SHOWFRAMERATE, FALSE, &mii); + mii.fState = (Settings.Paused && !Settings.StopEmulation) ? MFS_CHECKED : MFS_UNCHECKED; SetMenuItemInfo (GUI.hMenu, ID_FILE_PAUSE, FALSE, &mii);