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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2017-06-05 20:15:10 +10:00
parent 10243f05b0 c57a053c61
commit de497775b5
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config/Project64.rdb
View File

@ -3264,7 +3264,6 @@ Self Texture=1
Good Name=Mario Kart 64 (E) (V1.0) Good Name=Mario Kart 64 (E) (V1.0)
Internal Name=MARIOKART64 Internal Name=MARIOKART64
Status=Compatible Status=Compatible
Cheat0=81001A38 2409,81001A3A 0002,81001A3C 2409,81001A3E 0002,81001C90 240A,81001C92 0002,81001C94 240A,81001C96 0002 //Multiplayer timing fix
Plugin Note=[Glide64] missing TVs Plugin Note=[Glide64] missing TVs
Culling=1 Culling=1
Primary Frame Buffer=1 Primary Frame Buffer=1
@ -3273,7 +3272,6 @@ Primary Frame Buffer=1
Good Name=Mario Kart 64 (E) (V1.1) Good Name=Mario Kart 64 (E) (V1.1)
Internal Name=MARIOKART64 Internal Name=MARIOKART64
Status=Compatible Status=Compatible
Cheat0=81001A38 2409,81001A3A 0002,81001A3C 2409,81001A3E 0002,81001C90 240A,81001C92 0002,81001C94 240A,81001C96 0002 //Multiplayer timing fix
Plugin Note=[Glide64] missing TVs Plugin Note=[Glide64] missing TVs
Culling=1 Culling=1
Primary Frame Buffer=1 Primary Frame Buffer=1
@ -3282,7 +3280,6 @@ Primary Frame Buffer=1
Good Name=Mario Kart 64 (J) (V1.0) Good Name=Mario Kart 64 (J) (V1.0)
Internal Name=MARIOKART64 Internal Name=MARIOKART64
Status=Compatible Status=Compatible
Cheat0=81001A38 2409,81001A3A 0002,81001A3C 2409,81001A3E 0002,81001C90 240A,81001C92 0002,81001C94 240A,81001C96 0002 //Multiplayer timing fix
Plugin Note=[Glide64] missing TVs Plugin Note=[Glide64] missing TVs
Culling=1 Culling=1
Primary Frame Buffer=1 Primary Frame Buffer=1
@ -3291,7 +3288,6 @@ Primary Frame Buffer=1
Good Name=Mario Kart 64 (J) (V1.1) Good Name=Mario Kart 64 (J) (V1.1)
Internal Name=MARIOKART64 Internal Name=MARIOKART64
Status=Compatible Status=Compatible
Cheat0=81001A38 2409,81001A3A 0002,81001A3C 2409,81001A3E 0002,81001C90 240A,81001C92 0002,81001C94 240A,81001C96 0002 //Multiplayer timing fix
Plugin Note=[Glide64] missing TVs Plugin Note=[Glide64] missing TVs
Culling=1 Culling=1
Primary Frame Buffer=1 Primary Frame Buffer=1

19
Source/nragev20/DirectInput.cpp
View File

@ -678,8 +678,23 @@ BOOL CALLBACK EnumGetEffectTypes( LPCDIEFFECTINFO pdei, LPVOID pvRef )
// EnumMakeDeviceList has been rewritten. --rabid // EnumMakeDeviceList has been rewritten. --rabid
BOOL CALLBACK EnumMakeDeviceList( LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef ) BOOL CALLBACK EnumMakeDeviceList( LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef )
{ {
if( IsXInputDevice( &lpddi->guidProduct ) ) // Check if is XInput device --tecnicors switch (GET_DIDEVICE_TYPE(lpddi->dwDevType)) {
return DIENUM_CONTINUE; // we don't need to do anything with these generic devices
case DI8DEVTYPE_DEVICE:
return DIENUM_CONTINUE;
break;
// these are potential xinput controllers, check them
case DI8DEVTYPE_GAMEPAD:
case DI8DEVTYPE_DRIVING:
case DI8DEVTYPE_JOYSTICK:
case DI8DEVTYPE_FLIGHT:
if (IsXInputDevice(&lpddi->guidProduct)) // Check if is XInput device --tecnicors
return DIENUM_CONTINUE;
break;
// for all other devices, continue on
default:
break;
}
if (IsEqualGUID(g_sysMouse.guidInstance, lpddi->guidInstance)) if (IsEqualGUID(g_sysMouse.guidInstance, lpddi->guidInstance))
return DIENUM_CONTINUE; return DIENUM_CONTINUE;