summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-14 19:12:26 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-14 19:12:26 +0200
commitfbed2c4530a88c0a9cf92bd8bf135125f54a577e (patch)
tree59448a8bbce23d99e837f8f02531773692f1afaf
parentMerge branch 'master' into game_dev (diff)
downloadre3-fbed2c4530a88c0a9cf92bd8bf135125f54a577e.tar
re3-fbed2c4530a88c0a9cf92bd8bf135125f54a577e.tar.gz
re3-fbed2c4530a88c0a9cf92bd8bf135125f54a577e.tar.bz2
re3-fbed2c4530a88c0a9cf92bd8bf135125f54a577e.tar.lz
re3-fbed2c4530a88c0a9cf92bd8bf135125f54a577e.tar.xz
re3-fbed2c4530a88c0a9cf92bd8bf135125f54a577e.tar.zst
re3-fbed2c4530a88c0a9cf92bd8bf135125f54a577e.zip
Diffstat (limited to '')
-rw-r--r--src/core/Pad.cpp4
-rw-r--r--src/core/re3.cpp1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index aa840541..f83998b8 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -931,8 +931,8 @@ void CPad::UpdatePads(void)
GetPad(0)->UpdateMouse();
#ifdef XINPUT
- GetPad(0)->AffectFromXinput(1);
- GetPad(1)->AffectFromXinput(0);
+ GetPad(0)->AffectFromXinput(0);
+ GetPad(1)->AffectFromXinput(1);
#else
CapturePad(0);
#endif
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 096b9d9e..5d76d642 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -335,7 +335,6 @@ DebugMenuPopulate(void)
DebugMenuAddVarBool8("Debug", "Draw hud", (int8*)&CHud::m_Wants_To_Draw_Hud, nil);
DebugMenuAddVarBool8("Debug", "Edit on", (int8*)&CSceneEdit::m_bEditOn, nil);
- DebugMenuAddVarBool8("Debug", "MapPadOneToPadTwo", (int8*)&CPad::m_bMapPadOneToPadTwo, nil);
DebugMenuAddVar("Debug", "Engine Status", &engineStatus, nil, 1, 0, 226, nil);
DebugMenuAddCmd("Debug", "Set Engine Status", SetEngineStatus);
DebugMenuAddCmd("Debug", "Fix Car", FixCar);