summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-02 12:28:23 +0100
committerSergeanur <s.anureev@yandex.ua>2021-01-02 12:42:49 +0100
commit30bc51ae9e038ddde59479e81c4731c421798dd0 (patch)
tree7649ac8b6920a2648f3065c15012c9acebe03b82 /src/core
parentCVarConsole (diff)
downloadre3-30bc51ae9e038ddde59479e81c4731c421798dd0.tar
re3-30bc51ae9e038ddde59479e81c4731c421798dd0.tar.gz
re3-30bc51ae9e038ddde59479e81c4731c421798dd0.tar.bz2
re3-30bc51ae9e038ddde59479e81c4731c421798dd0.tar.lz
re3-30bc51ae9e038ddde59479e81c4731c421798dd0.tar.xz
re3-30bc51ae9e038ddde59479e81c4731c421798dd0.tar.zst
re3-30bc51ae9e038ddde59479e81c4731c421798dd0.zip
Diffstat (limited to '')
-rw-r--r--src/core/Pad.cpp7
-rw-r--r--src/core/main.cpp4
2 files changed, 5 insertions, 6 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
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 9e48aaf4..d9579fee 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -134,7 +134,7 @@ bool gbNewRenderer;
#define CLEARMODE (rwCAMERACLEARZ)
#endif
-bool bDisplayNumPfAtomicsRendered = false;
+bool bDisplayNumOfAtomicsRendered = false;
bool bDisplayPosn = false;
void
@@ -478,7 +478,7 @@ Initialise3D(void *param)
PUSH_MEMID(MEMID_RENDER);
#ifndef MASTER
- VarConsole.Add("Display number of atomics rendered", &bDisplayNumPfAtomicsRendered, true);
+ VarConsole.Add("Display number of atomics rendered", &bDisplayNumOfAtomicsRendered, true);
VarConsole.Add("Display posn and framerate", &bDisplayPosn, true);
#endif