Merge branch 'master' into ps2menu

2020-06-29 09:37:53 +03:00
parent 1f1782c587 209b7891d1
commit 860f75d66c
145 changed files with 15893 additions and 12764 deletions
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -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