diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 2b72bf88..ea477ba0 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -7,7 +7,8 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "afxres.h" + ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -90,6 +91,7 @@ BEGIN MENUITEM "4 player", MENU_INPUTDISPLAY_4 END MENUITEM "Lag Counter", ID_DISPLAY_LAGCOUNTER40245 + MENUITEM "Frame Counter", ID_DISPLAY_FRAMECOUNTER MENUITEM SEPARATOR MENUITEM "Graphics: BG", MENU_DISPLAY_BG MENUITEM "Graphics: OBJ", MENU_DISPLAY_OBJ @@ -1601,7 +1603,8 @@ IDB_TE_ARROW BITMAP "res/te_arrow.bmp" // // Generated from the TEXTINCLUDE 3 resource. // - + + ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index b91996af..dd3b5faf 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -535,6 +535,7 @@ #define MENU_INPUTDISPLAY_1 40251 #define MENU_INPUTDISPLAY_2 40252 #define MENU_INPUTDISPLAY_4 40253 +#define ID_DISPLAY_FRAMECOUNTER 40254 #define IDC_DEBUGGER_ICONTRAY 55535 #define MW_ValueLabel2 65423 #define MW_ValueLabel1 65426 @@ -544,7 +545,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 124 -#define _APS_NEXT_COMMAND_VALUE 40254 +#define _APS_NEXT_COMMAND_VALUE 40255 #define _APS_NEXT_CONTROL_VALUE 1181 #define _APS_NEXT_SYMED_VALUE 101 #endif diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index aec890fa..36346cc6 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -313,6 +313,9 @@ void UpdateCheckedMenuItems() CheckMenuItem(fceumenu, MENU_BACKGROUND_INPUT, EnableBackgroundInput ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(fceumenu, MENU_ENABLE_AUTOSAVE, EnableAutosave ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(fceumenu, ID_DISPLAY_FRAMECOUNTER, frame_display ? MF_CHECKED : MF_UNCHECKED); + + int AutoFirePatternIDs[] = { MENU_AUTOFIRE_PATTERN_1, MENU_AUTOFIRE_PATTERN_2, @@ -986,6 +989,11 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam) UpdateCheckedMenuItems(); break; + case ID_DISPLAY_FRAMECOUNTER: + FCEUI_MovieToggleFrameDisplay(); + UpdateCheckedMenuItems(); + break; + case MENU_SHOW_STATUS_ICON: // Show status icon menu was selected status_icon = !status_icon;