summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-10-25 01:25:11 +0200
committereray orçunus <erayorcunus@gmail.com>2019-10-25 21:17:55 +0200
commit2d998b24163060e225481d0f9a59092fa0981db1 (patch)
tree4c2f670644db151e0afbb3d5f707e5e1457f234c /src/core
parentMerge pull request #247 from Sergeanur/3dMarkers (diff)
downloadre3-2d998b24163060e225481d0f9a59092fa0981db1.tar
re3-2d998b24163060e225481d0f9a59092fa0981db1.tar.gz
re3-2d998b24163060e225481d0f9a59092fa0981db1.tar.bz2
re3-2d998b24163060e225481d0f9a59092fa0981db1.tar.lz
re3-2d998b24163060e225481d0f9a59092fa0981db1.tar.xz
re3-2d998b24163060e225481d0f9a59092fa0981db1.tar.zst
re3-2d998b24163060e225481d0f9a59092fa0981db1.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Game.cpp3
-rw-r--r--src/core/re3.cpp2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 00d50fa8..b2bac8dd 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -80,12 +80,15 @@ WRAPPER void CGame::Initialise(const char *datFile) { EAXJMP(0x48BED0); }
#if 0
WRAPPER void CGame::Process(void) { EAXJMP(0x48C850); }
#else
+extern void (*DebugMenuProcess)(void);
void CGame::Process(void)
{
CPad::UpdatePads();
TheCamera.SetMotionBlurAlpha(0);
if (TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_SNIPER || TheCamera.m_BlurType == MBLUR_NORMAL)
TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE);
+
+ DebugMenuProcess();
CCutsceneMgr::Update();
if (!CCutsceneMgr::IsCutsceneProcessing() && !CTimer::GetIsCodePaused())
FrontEndMenuManager.Process();
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index c8b50d55..62e9a040 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -18,6 +18,7 @@
#include "Automobile.h"
#include "Ped.h"
#include "debugmenu_public.h"
+#include "Particle.h"
#include <vector>
#include <list>
@@ -352,6 +353,7 @@ DebugMenuPopulate(void)
DebugMenuAddCmd("Debug", "Make peds follow you in formation", LetThemFollowYou);
#ifndef MASTER
DebugMenuAddVarBool8("Debug", "Toggle unused fight feature", (int8*)&CPed::bUnusedFightThingOnPlayer, nil);
+ DebugMenuAddVarBool8("Debug", "Toggle banned particles", (int8*)&CParticle::bEnableBannedParticles, nil);
#endif
DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);