summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-15 22:27:23 +0200
committerGitHub <noreply@github.com>2020-04-15 22:27:23 +0200
commita43ca86542e904aa4f6a193ebda7d628c8015ab7 (patch)
treeefe0da93c1ffbe69e1c9e5df2ab65b13f3a83a84 /src/core
parentMerge pull request #447 from erorcun/erorcun (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-a43ca86542e904aa4f6a193ebda7d628c8015ab7.tar
re3-a43ca86542e904aa4f6a193ebda7d628c8015ab7.tar.gz
re3-a43ca86542e904aa4f6a193ebda7d628c8015ab7.tar.bz2
re3-a43ca86542e904aa4f6a193ebda7d628c8015ab7.tar.lz
re3-a43ca86542e904aa4f6a193ebda7d628c8015ab7.tar.xz
re3-a43ca86542e904aa4f6a193ebda7d628c8015ab7.tar.zst
re3-a43ca86542e904aa4f6a193ebda7d628c8015ab7.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Game.cpp2
-rw-r--r--src/core/main.cpp3
-rw-r--r--src/core/re3.cpp3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index daac3ec5..fe747ac1 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -350,7 +350,7 @@ bool CGame::Initialise(const char* datFile)
CAntennas::Init();
CGlass::Init();
gPhoneInfo.Initialise();
- CSceneEdit::Init();
+ CSceneEdit::Initialise();
LoadingScreen("Loading the Game", "Load scripts", nil);
CTheScripts::Init();
CGangs::Initialise();
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 2d452f9c..6d263b8c 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;
@@ -864,11 +865,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 321ff172..5d76d642 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>
@@ -332,6 +334,7 @@ DebugMenuPopulate(void)
DebugMenuAddCmd("Spawn", "Spawn Predator", [](){ SpawnCar(MI_PREDATOR); });
DebugMenuAddVarBool8("Debug", "Draw hud", (int8*)&CHud::m_Wants_To_Draw_Hud, nil);
+ DebugMenuAddVarBool8("Debug", "Edit on", (int8*)&CSceneEdit::m_bEditOn, nil);
DebugMenuAddVar("Debug", "Engine Status", &engineStatus, nil, 1, 0, 226, nil);
DebugMenuAddCmd("Debug", "Set Engine Status", SetEngineStatus);
DebugMenuAddCmd("Debug", "Fix Car", FixCar);