Merge pull request #253 from erorcun/erorcun

Fixes&Peds
GTAmodding · Oct 25, 2019 · e7cb489b2234df6da46317c8e5d092032ed6bdf6 · e7cb489
2 parents ccf9c53 + 2d998b2
commit e7cb489b2234df6da46317c8e5d092032ed6bdf6
Unified Split

Showing with 368 additions and 8 deletions.

+3 −0 src/core/Game.cpp

+2 −0 src/core/re3.cpp

+344 −3 src/peds/Ped.cpp

+2 −1 src/peds/Ped.h

+2 −1 src/render/Hud.cpp

+12 −3 src/render/Particle.cpp

+3 −0 src/render/Particle.h
diff --git 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
@@ -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);