Merge branch 'master' into ps2menu

This commit is contained in:
Fire_Head authored and GitHub committed 2020-06-29 09:37:53 +03:00
commit 860f75d66c
145 files changed
+15893 -12764

No files matched your search

+2 -2
View File
@@ -1068,8 +1068,8 @@ void CPad::UpdatePads(void)
GetPad(0)->UpdateMouse();
#ifdef XINPUT
GetPad(0)->AffectFromXinput(0);
GetPad(1)->AffectFromXinput(1);
GetPad(0)->AffectFromXinput(m_bMapPadOneToPadTwo ? 1 : 0);
GetPad(1)->AffectFromXinput(m_bMapPadOneToPadTwo ? 0 : 1);
#else
CapturePad(0);
#endif