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.h
+++ b/src/core/World.h
@@ -102,6 +102,7 @@ public:
 	static float FindGroundZForCoord(float x, float y);
 	static float FindGroundZFor3DCoord(float x, float y, float z, bool *found);
 	static float FindRoofZFor3DCoord(float x, float y, float z, bool *found);
+	static void RemoveReferencesToDeletedObject(CEntity*);

 	static float GetSectorX(float f) { return ((f - WORLD_MIN_X)/SECTOR_SIZE_X); }
 	static float GetSectorY(float f) { return ((f - WORLD_MIN_Y)/SECTOR_SIZE_Y); }