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

fix some multi-gamepad bugs

This commit is contained in:
zeromus 2009-12-04 05:44:56 +00:00
parent e82e1733db
commit ccf7dfb10c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
desmume/src/windows/inputdx.cpp
View File

@ -647,10 +647,9 @@ void CheckAxis_game (int val, int min, int max, bool &first, bool &second)
void S9xUpdateJoyState() void S9xUpdateJoyState()
{ {
memset(&Joystick[0],0,sizeof(Joystick[0]));
for(int C=0;C<16;C++) for(int C=0;C<16;C++)
{ {
memset(&Joystick[C],0,sizeof(Joystick[C]));
if(!JoystickF[C].Attached) continue; if(!JoystickF[C].Attached) continue;
LPDIRECTINPUTDEVICE8 pJoystick = JoystickF[C].Device; LPDIRECTINPUTDEVICE8 pJoystick = JoystickF[C].Device;
if (pJoystick) if (pJoystick)
@ -666,8 +665,8 @@ void S9xUpdateJoyState()
if (FAILED(hr)) hr=pJoystick->Acquire(); if (FAILED(hr)) hr=pJoystick->Acquire();
else else
{ {
CheckAxis_game(JoyStatus.lX,-10000,10000,Joystick[0].Left,Joystick[0].Right); CheckAxis_game(JoyStatus.lX,-10000,10000,Joystick[C].Left,Joystick[C].Right);
CheckAxis_game(JoyStatus.lY,-10000,10000,Joystick[0].Up,Joystick[0].Down); CheckAxis_game(JoyStatus.lY,-10000,10000,Joystick[C].Up,Joystick[C].Down);
switch (JoyStatus.rgdwPOV[0]) switch (JoyStatus.rgdwPOV[0])
{ {
@ -741,8 +740,8 @@ void di_poll_scan()
if (FAILED(hr)) hr=pJoystick->Acquire(); if (FAILED(hr)) hr=pJoystick->Acquire();
else else
{ {
CheckAxis(0,0,JoyStatus.lX,-10000,10000,Joystick[C].Left,Joystick[C].Right); CheckAxis(C,0,JoyStatus.lX,-10000,10000,Joystick[C].Left,Joystick[C].Right);
CheckAxis(0,2,JoyStatus.lY,-10000,10000,Joystick[C].Down,Joystick[C].Up); CheckAxis(C,2,JoyStatus.lY,-10000,10000,Joystick[C].Down,Joystick[C].Up);
switch (JoyStatus.rgdwPOV[0]) switch (JoyStatus.rgdwPOV[0])
{ {