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

resource stuff: added back auto-hold and changed "disable lrud" to "allow lrud" on input dialog. other minor design changes in res.rc

This commit is contained in:
mauzus 2008-05-21 08:45:21 +00:00
parent 70f5b31300
commit 335d52614f
4 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/win/config.cpp
View File

@ -40,7 +40,7 @@ extern int autoHoldKey, autoHoldClearKey;
extern int frame_display; extern int frame_display;
extern int input_display; extern int input_display;
extern char *BasicBotDir; extern char *BasicBotDir;
extern int disableUDLR; extern int allowUDLR;
//window positions: //window positions:
extern int ChtPosX,ChtPosY; extern int ChtPosX,ChtPosY;
@ -173,7 +173,7 @@ static CFGSTRUCT fceuconfig[] = {
AC(MemWatchLoadOnStart), AC(MemWatchLoadOnStart),
AC(MemWatchLoadFileOnStart), AC(MemWatchLoadFileOnStart),
AC(disableUDLR), AC(allowUDLR),
//window positions //window positions
AC(ChtPosX), AC(ChtPosX),

15
src/drivers/win/input.cpp
View File

@ -136,7 +136,7 @@ static int DIPS=0;
//#define KEY(__a) keys_nr[MKK(__a)] //#define KEY(__a) keys_nr[MKK(__a)]
int cidisabled=0; int cidisabled=0;
int disableUDLR=0; int allowUDLR=1;
#define MK(x) {{BUTTC_KEYBOARD},{0},{MKK(x)},1} #define MK(x) {{BUTTC_KEYBOARD},{0},{MKK(x)},1}
#define MC(x) {{BUTTC_KEYBOARD},{0},{x},1} #define MC(x) {{BUTTC_KEYBOARD},{0},{x},1}
@ -222,7 +222,7 @@ void UpdateGamepad()
JS|=(1<<x)<<(wg<<3); JS|=(1<<x)<<(wg<<3);
// Check if U+D/L+R is disabled // Check if U+D/L+R is disabled
if(disableUDLR) if(!allowUDLR)
{ {
for(x=0;x<32;x+=8) for(x=0;x<32;x+=8)
{ {
@ -1046,10 +1046,7 @@ BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
// Update the disable UDLR checkbox based on the current value // Update the disable UDLR checkbox based on the current value
CheckDlgButton(hwndDlg,BTN_DISABLE_LRUD,disableUDLR?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(hwndDlg,BTN_ALLOW_LRUD,allowUDLR?BST_CHECKED:BST_UNCHECKED);
// Add the help text
SetDlgItemText(hwndDlg, LBL_INPUT_HELP, "Select the device you want to be enabled on input ports 1 and 2, and the Famicom expansion port. You may configure the device listed above each drop-down list by pressing \"Configure\", if applicable. The device currently being emulated on the each port is listed above the drop down list; loading certain games will override your settings, but only temporarily. If you select a device to be on the emulated Famicom Expansion Port, you should probably have emulated gamepads on the emulated NES-style input ports.");
// Initialize the controls for the input ports // Initialize the controls for the input ports
for(unsigned int port = 0; port < NUMBER_OF_PORTS; port++) for(unsigned int port = 0; port < NUMBER_OF_PORTS; port++)
@ -1165,10 +1162,10 @@ BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
case WM_COMMAND: case WM_COMMAND:
// Handle disable UD/LR option // Handle disable UD/LR option
if(HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == BTN_DISABLE_LRUD) if(HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == BTN_ALLOW_LRUD)
{ {
FCEU_printf("Disable UDLR toggled\n"); FCEU_printf("Allow UDLR toggled.\n");
disableUDLR = !disableUDLR; allowUDLR = !allowUDLR;
} }
if(HIWORD(wParam) == CBN_SELENDOK) if(HIWORD(wParam) == CBN_SELENDOK)

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

Binary file not shown.

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

@ -209,26 +209,16 @@
#define GUI_BOT_TITLEL5 1112 #define GUI_BOT_TITLEL5 1112
#define GUI_BOT_TITLEL6 1113 #define GUI_BOT_TITLEL6 1113
#define GUI_BOT_COUNTERS 1114 #define GUI_BOT_COUNTERS 1114
#define IDC_CHECK1 1117 #define BTN_ALLOW_LRUD 1117
#define BTN_DISABLE_LRUD 1117 #define BTN_PRESET_SET1 1119
#define IDC_BUTTON2 1119 #define BTN_PRESET_SET2 1120
#define IDC_SET1 1119 #define BTN_PRESET_SET3 1121
#define IDC_BUTTON3 1120 #define BTN_PRESET_IMPORT1 1122
#define IDC_SET2 1120 #define BTN_PRESET_IMPORT2 1123
#define IDC_BUTTON4 1121 #define BTN_PRESET_IMPORT3 1124
#define IDC_SET3 1121 #define BTN_PRESET_EXPORT1 1125
#define IDC_BUTTON5 1122 #define BTN_PRESET_EXPORT2 1126
#define IDC_IMPORT1 1122 #define BTN_PRESET_EXPORT3 1127
#define IDC_BUTTON6 1123
#define IDC_IMPORT2 1123
#define IDC_BUTTON7 1124
#define IDC_IMPORT3 1124
#define IDC_BUTTON8 1125
#define IDC_EXPORT1 1125
#define IDC_BUTTON9 1126
#define IDC_EXPORT2 1126
#define IDC_BUTTON10 1127
#define IDC_EXPORT3 1127
#define MENU_NETWORK 40040 #define MENU_NETWORK 40040
#define MENU_PALETTE 40041 #define MENU_PALETTE 40041
#define MENU_SOUND 40042 #define MENU_SOUND 40042