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

fix noise bits in snes pad and remove 2nd (for fourscore) pads from snes config dialogs

This commit is contained in:
zeromus 2016-03-31 01:39:43 +00:00
parent 094d1bb827
commit a67274689c
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
trunk/src/drivers/win/input.cpp
View File

@ -257,9 +257,10 @@ void UpdateGamepad(bool snes)
if(snes) if(snes)
{ {
wgs = 0; wgs = 0;
for(int x=0;x<16;x++) for(int x=0;x<12;x++)
if(DTestButton(&GamePadConfig[wg][x])) if(DTestButton(&GamePadConfig[wg][x]))
JS|=(1<<x)<<(wgs<<3); JS|=(1<<x)<<(wgs<<3);
printf("%d %d\n",wg,JS);
} }
else else
{ {
@ -1066,9 +1067,6 @@ static BOOL CALLBACK DoTBCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
char buf[32]; char buf[32];
sprintf(buf,"Virtual SNES Pad %d",DoTBPort+1); sprintf(buf,"Virtual SNES Pad %d",DoTBPort+1);
SetDlgItemText(hwndDlg, GRP_GAMEPAD1,buf); SetDlgItemText(hwndDlg, GRP_GAMEPAD1,buf);
sprintf(buf,"Virtual SNES Pad %d",DoTBPort+3);
SetDlgItemText(hwndDlg, GRP_GAMEPAD2, buf);
} }
SetWindowText(hwndDlg, DoTBTitle); SetWindowText(hwndDlg, DoTBTitle);
break; break;

5
trunk/src/drivers/win/res.rc
View File

@ -1611,12 +1611,12 @@ BEGIN
EDITTEXT IDC_PROMPT_EDIT,10,15,167,14,ES_AUTOHSCROLL EDITTEXT IDC_PROMPT_EDIT,10,15,167,14,ES_AUTOHSCROLL
END END
DLG_SNESPAD DIALOGEX 4, 109, 243, 220 DLG_SNESPAD DIALOGEX 4, 109, 243, 121
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Gamepad Configuration" CAPTION "Gamepad Configuration"
FONT 8, "MS Sans Serif", 0, 0, 0x0 FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN BEGIN
DEFPUSHBUTTON "Close",BTN_CLOSE,173,196,56,14 DEFPUSHBUTTON "Close",BTN_CLOSE,177,97,56,14
GROUPBOX "",GRP_GAMEPAD1,4,8,232,82,WS_GROUP GROUPBOX "",GRP_GAMEPAD1,4,8,232,82,WS_GROUP
PUSHBUTTON "Up",304,35,36,24,12 PUSHBUTTON "Up",304,35,36,24,12
PUSHBUTTON "Left",306,9,54,25,12 PUSHBUTTON "Left",306,9,54,25,12
@ -1630,7 +1630,6 @@ BEGIN
PUSHBUTTON "X",309,181,40,16,12 PUSHBUTTON "X",309,181,40,16,12
PUSHBUTTON "L",310,10,19,32,12 PUSHBUTTON "L",310,10,19,32,12
PUSHBUTTON "R",311,198,19,32,12 PUSHBUTTON "R",311,198,19,32,12
GROUPBOX "",GRP_GAMEPAD2,4,101,232,82,WS_GROUP
END END