summaryrefslogtreecommitdiffstats
path: root/src/core/Pad.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-03 17:01:17 +0100
committerGitHub <noreply@github.com>2021-01-03 17:01:17 +0100
commit65796459343a01ddd17170104599ae340b90bb1d (patch)
treed16a5bc09e9cebd006085f30a27dfb3567927ee7 /src/core/Pad.cpp
parentMerge pull request #921 from TheOfficialFloW/patch-2 (diff)
parentPad2 fix (diff)
downloadre3-65796459343a01ddd17170104599ae340b90bb1d.tar
re3-65796459343a01ddd17170104599ae340b90bb1d.tar.gz
re3-65796459343a01ddd17170104599ae340b90bb1d.tar.bz2
re3-65796459343a01ddd17170104599ae340b90bb1d.tar.lz
re3-65796459343a01ddd17170104599ae340b90bb1d.tar.xz
re3-65796459343a01ddd17170104599ae340b90bb1d.tar.zst
re3-65796459343a01ddd17170104599ae340b90bb1d.zip
Diffstat (limited to 'src/core/Pad.cpp')
-rw-r--r--src/core/Pad.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 4a78e834..feda19c6 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -1692,12 +1692,11 @@ void CPad::UpdatePads(void)
bUpdate = false;
if ( bUpdate )
- {
GetPad(0)->Update(0);
- // GetPad(1)->Update(0); // not in VC
- }
-#if defined(MASTER) && !defined(XINPUT)
+#ifndef MASTER
+ GetPad(1)->Update(1);
+#else
GetPad(1)->NewState.Clear();
GetPad(1)->OldState.Clear();
#endif