Merge branch 'master' into erorcun

2019-07-16 18:31:18 +02:00
parent 2c138b2b77 568b3de9cc
commit 9477aca836
32 changed files with 1386 additions and 447 deletions
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@ -28,6 +28,8 @@ bool &CWorld::bSecondShift = *(bool*)0x95CD54;
 bool &CWorld::bForceProcessControl = *(bool*)0x95CD6C;
 bool &CWorld::bProcessCutsceneOnly = *(bool*)0x95CD8B;

+WRAPPER void CWorld::RemoveReferencesToDeletedObject(CEntity*) { EAXJMP(0x4B3BF0); }
+
 void
 CWorld::Add(CEntity *ent)
 {