summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-13 20:50:56 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-13 20:50:56 +0200
commitcb85091d34dd92695a075a13ff129ae568c0acda (patch)
tree7f61a913cf40a6ec25e0561c64b4b5bfd3c0280f /src/core
parentMerge branch 'master' into game_dev (diff)
downloadre3-cb85091d34dd92695a075a13ff129ae568c0acda.tar
re3-cb85091d34dd92695a075a13ff129ae568c0acda.tar.gz
re3-cb85091d34dd92695a075a13ff129ae568c0acda.tar.bz2
re3-cb85091d34dd92695a075a13ff129ae568c0acda.tar.lz
re3-cb85091d34dd92695a075a13ff129ae568c0acda.tar.xz
re3-cb85091d34dd92695a075a13ff129ae568c0acda.tar.zst
re3-cb85091d34dd92695a075a13ff129ae568c0acda.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Pad.cpp4
-rw-r--r--src/core/main.cpp3
-rw-r--r--src/core/re3.cpp4
3 files changed, 7 insertions, 4 deletions
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index f83998b8..aa840541 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(0);
- GetPad(1)->AffectFromXinput(1);
+ GetPad(0)->AffectFromXinput(1);
+ GetPad(1)->AffectFromXinput(0);
#else
CapturePad(0);
#endif
diff --git a/src/core/main.cpp b/src/core/main.cpp
index f09c2e0a..2bfe8290 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -58,6 +58,7 @@
#include "Console.h"
#include "timebars.h"
#include "GenericGameStorage.h"
+#include "SceneEdit.h"
GlobalScene &Scene = *(GlobalScene*)0x726768;
@@ -863,11 +864,9 @@ Render2dStuff(void)
MusicManager.DisplayRadioStationName();
TheConsole.Display();
-/*
if(CSceneEdit::m_bEditOn)
CSceneEdit::Draw();
else
-*/
CHud::Draw();
CUserDisplay::OnscnTimer.ProcessForDisplay();
CMessages::Display();
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 00674b19..475176b6 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -22,6 +22,8 @@
#include "Console.h"
#include "Debug.h"
#include "Hud.h"
+#include "SceneEdit.h"
+#include "Pad.h"
#include <list>
@@ -344,6 +346,8 @@ DebugMenuPopulate(void)
DebugMenuAddCmd("Spawn", "Spawn Firetruck", [](){ SpawnCar(MI_FIRETRUCK); });
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);