summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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