merge with upstream

2020-03-29 18:51:18 +03:00
parent 02615ccd98 0cbdca632f
commit 24b8c7819c
46 changed files with 847 additions and 589 deletions
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -135,6 +135,7 @@ public:
 	static void Initialise();
 	static void AddParticles();
 	static void ShutDown();
+	static void ClearForRestart(void);
 	static void RepositionCertainDynamicObjects();
 	static void RemoveStaticObjects();
 	static void Process();