summaryrefslogtreecommitdiffstats
path: root/src/core/World.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-08-15 17:06:03 +0200
committerGitHub <noreply@github.com>2019-08-15 17:06:03 +0200
commitb246274d9fc198c331a19a5dafc8afad9d911dc7 (patch)
tree35bac433fe9a98acdaae40c62cb8753ce422aa54 /src/core/World.cpp
parentMerge pull request #190 from Fire-Head/master (diff)
parentMerge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff)
downloadre3-b246274d9fc198c331a19a5dafc8afad9d911dc7.tar
re3-b246274d9fc198c331a19a5dafc8afad9d911dc7.tar.gz
re3-b246274d9fc198c331a19a5dafc8afad9d911dc7.tar.bz2
re3-b246274d9fc198c331a19a5dafc8afad9d911dc7.tar.lz
re3-b246274d9fc198c331a19a5dafc8afad9d911dc7.tar.xz
re3-b246274d9fc198c331a19a5dafc8afad9d911dc7.tar.zst
re3-b246274d9fc198c331a19a5dafc8afad9d911dc7.zip
Diffstat (limited to '')
-rw-r--r--src/core/World.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index c6eb831c..9c3aafcf 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -28,10 +28,28 @@ bool &CWorld::bSecondShift = *(bool*)0x95CD54;
bool &CWorld::bForceProcessControl = *(bool*)0x95CD6C;
bool &CWorld::bProcessCutsceneOnly = *(bool*)0x95CD8B;
+bool &CWorld::bDoingCarCollisions = *(bool*)0x95CD8C;
+bool &CWorld::bIncludeCarTyres = *(bool*)0x95CDAA;
+
+WRAPPER void CWorld::Process(void) { EAXJMP(0x4B1A60); }
+WRAPPER void CWorld::ShutDown(void) { EAXJMP(0x4AE450); }
WRAPPER void CWorld::RemoveReferencesToDeletedObject(CEntity*) { EAXJMP(0x4B3BF0); }
WRAPPER void CWorld::FindObjectsKindaColliding(const CVector &, float, bool, int16*, int16, CEntity **, bool, bool, bool, bool, bool){ EAXJMP(0x4B2A30); }
void
+CWorld::Initialise()
+{
+ pIgnoreEntity = nil;
+ bDoingCarCollisions = false;
+ bSecondShift = false;
+ bNoMoreCollisionTorque = false;
+ bProcessCutsceneOnly = false;
+ bIncludeDeadPeds = false;
+ bForceProcessControl = false;
+ bIncludeCarTyres = false;
+}
+
+void
CWorld::Add(CEntity *ent)
{
if(ent->IsVehicle() || ent->IsPed())