Merge remote-tracking branch 'Fire-Head/master' into Standalone

# Conflicts: # src/render/Coronas.cpp
2020-04-17 10:17:38 +03:00
parent 881d61f811 a4922d5cb7
commit b9c8ce0d37
129 changed files with 1316 additions and 1365 deletions
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -73,8 +73,8 @@ public:
 	CEntity *m_pCollidingEntity;
 	int8 m_colour1, m_colour2;

-	static int16 &nNoTempObjects;
-	static int16 &nBodyCastHealth;
+	static int16 nNoTempObjects;
+	static int16 nBodyCastHealth;

 	static void *operator new(size_t);
 	static void *operator new(size_t, int);