ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added input display to the main menu

This commit is contained in:
adelikat 2008-08-08 19:03:15 +00:00
parent 9c496fa3f4
commit 9d0e6ecb9e
4 changed files with 67 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -1,5 +1,5 @@
---version 2.0.2 released--- ---version 2.0.2 released---
08-aug-2008 - adelikat - added input display to the FCEUX main menu
08-aug-2008 - adelikat - fixed the (null) in the default lua directory listing 08-aug-2008 - adelikat - fixed the (null) in the default lua directory listing
08-aug-2008 - adelikat - added shift+L as default hotkey for reload lua script 08-aug-2008 - adelikat - added shift+L as default hotkey for reload lua script
08-aug-2008 - adelikat - removed accel ctrl+x (prevented cut from working in accel dialogs) 08-aug-2008 - adelikat - removed accel ctrl+x (prevented cut from working in accel dialogs)

10
src/drivers/win/res.rc
View File

@ -83,7 +83,15 @@ BEGIN
POPUP "Display" POPUP "Display"
BEGIN BEGIN
MENUITEM "Movie Status Icon", MENU_SHOW_STATUS_ICON MENUITEM "Movie Status Icon", MENU_SHOW_STATUS_ICON
MENUITEM "Lag Counter", MENU_DISPLAY_LAGCOUNTER POPUP "Input Display"
BEGIN
MENUITEM "Off", MENU_INPUTDISPLAY_0
MENUITEM "1 player", MENU_INPUTDISPLAY_1
MENUITEM "2 player", MENU_INPUTDISPLAY_2
MENUITEM "4 player", MENU_INPUTDISPLAY_4
END
MENUITEM "Lag Counter", ID_DISPLAY_LAGCOUNTER40245
MENUITEM SEPARATOR
MENUITEM "Graphics: BG", MENU_DISPLAY_BG MENUITEM "Graphics: BG", MENU_DISPLAY_BG
MENUITEM "Graphics: OBJ", MENU_DISPLAY_OBJ MENUITEM "Graphics: OBJ", MENU_DISPLAY_OBJ
END END

17
src/drivers/win/resource.h
View File

@ -357,7 +357,6 @@
#define IDC_EDIT1 1147 #define IDC_EDIT1 1147
#define IDC_BUTTON9 1148 #define IDC_BUTTON9 1148
#define IDC_LIST2 1149 #define IDC_LIST2 1149
#define SOUND_MUTETURBO 1179
#define CHECK_SOUND_MUTETURBO 1179 #define CHECK_SOUND_MUTETURBO 1179
#define MENU_NETWORK 40040 #define MENU_NETWORK 40040
#define MENU_PALETTE 40041 #define MENU_PALETTE 40041
@ -519,6 +518,20 @@
#define MENU_DISPLAY_LAGCOUNTER 40237 #define MENU_DISPLAY_LAGCOUNTER 40237
#define ID_DISPLAY_FRAMEADV 40238 #define ID_DISPLAY_FRAMEADV 40238
#define MENU_DISPLAY_FA_LAGSKIP 40239 #define MENU_DISPLAY_FA_LAGSKIP 40239
#define ID_DISPLAY_INPUTDISPLAY40240 40240
#define ID_LAGCOUNTER_OFF 40241
#define ID_LAGCOUNTER_1PLAYER 40242
#define ID_LAGCOUNTER_2PLAYER 40243
#define ID_LAGCOUNTER_4PLAYER 40244
#define ID_DISPLAY_LAGCOUNTER40245 40245
#define MENU_INPUTDISPLAY_OFF 40246
#define MENU_INPUTDISPLAY_1P 40247
#define MENU_INPUTDISPLAY_2P 40248
#define MENU_INPUTDISPLAY_4P 40249
#define MENU_INPUTDISPLAY_0 40250
#define MENU_INPUTDISPLAY_1 40251
#define MENU_INPUTDISPLAY_2 40252
#define MENU_INPUTDISPLAY_4 40253
#define IDC_DEBUGGER_ICONTRAY 55535 #define IDC_DEBUGGER_ICONTRAY 55535
#define MW_ValueLabel2 65423 #define MW_ValueLabel2 65423
#define MW_ValueLabel1 65426 #define MW_ValueLabel1 65426
@ -528,7 +541,7 @@
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_RESOURCE_VALUE 124
#define _APS_NEXT_COMMAND_VALUE 40240 #define _APS_NEXT_COMMAND_VALUE 40254
#define _APS_NEXT_CONTROL_VALUE 1180 #define _APS_NEXT_CONTROL_VALUE 1180
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif

42
src/drivers/win/window.cpp
View File

@ -358,6 +358,30 @@ void UpdateCheckedMenuItems()
AutoFireOffsetIDs[x] == CheckedAutoFireOffset ? MF_CHECKED : MF_UNCHECKED); AutoFireOffsetIDs[x] == CheckedAutoFireOffset ? MF_CHECKED : MF_UNCHECKED);
x++; x++;
} }
//Check input display
CheckMenuItem(fceumenu, MENU_INPUTDISPLAY_0, MF_UNCHECKED);
CheckMenuItem(fceumenu, MENU_INPUTDISPLAY_1, MF_UNCHECKED);
CheckMenuItem(fceumenu, MENU_INPUTDISPLAY_2, MF_UNCHECKED);
CheckMenuItem(fceumenu, MENU_INPUTDISPLAY_4, MF_UNCHECKED);
switch (input_display)
{
case 0: //Off
CheckMenuItem(fceumenu, MENU_INPUTDISPLAY_0, MF_CHECKED);
break;
case 1: //1 player
CheckMenuItem(fceumenu, MENU_INPUTDISPLAY_1, MF_CHECKED);
break;
case 2: //2 player
CheckMenuItem(fceumenu, MENU_INPUTDISPLAY_2, MF_CHECKED);
break;
//note: input display can actually have a 3 player display option but is skipped in the hotkey toggle so it is skipped here as well
case 4: //4 player
CheckMenuItem(fceumenu, MENU_INPUTDISPLAY_4, MF_CHECKED);
break;
default:
break;
}
} }
/// Updates recent files / recent directories menu /// Updates recent files / recent directories menu
@ -1180,9 +1204,27 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
case MENU_DISPLAY_LAGCOUNTER: case MENU_DISPLAY_LAGCOUNTER:
lagCounterDisplay ^= 1; lagCounterDisplay ^= 1;
UpdateCheckedMenuItems(); UpdateCheckedMenuItems();
break;
case MENU_DISPLAY_FA_LAGSKIP: case MENU_DISPLAY_FA_LAGSKIP:
frameAdvanceLagSkip ^= 1; frameAdvanceLagSkip ^= 1;
UpdateCheckedMenuItems(); UpdateCheckedMenuItems();
break;
case MENU_INPUTDISPLAY_0: //Input display off
input_display = 0;
UpdateCheckedMenuItems();
break;
case MENU_INPUTDISPLAY_1: //Input display - 1 player
input_display = 1;
UpdateCheckedMenuItems();
break;
case MENU_INPUTDISPLAY_2: //Input display - 2 player
input_display = 2;
UpdateCheckedMenuItems();
break;
case MENU_INPUTDISPLAY_4: //Input display - 4 player
input_display = 4;
UpdateCheckedMenuItems();
break;
} }
} }