merge

2019-10-26 17:20:31 +03:00
parent 542e746f66 35bd3f514d
commit 3dee880c29
99 changed files with 6011 additions and 2727 deletions
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -124,6 +124,8 @@ public:

 	static void Initialise();
 	static void ShutDown();
+	static void RepositionCertainDynamicObjects();
+	static void RemoveStaticObjects();
 	static void Process();
 };