merge with upstream

2020-03-22 19:47:14 +03:00
parent d1d123dc6a 0e817230af
commit 861506d048
31 changed files with 4593 additions and 4326 deletions
--- a/src/render/WaterCannon.h
+++ b/src/render/WaterCannon.h
@@ -23,4 +23,5 @@ public:
 	static void Init(void);
 };

-extern CWaterCannon *aCannons;
+extern CWaterCannon (&aCannons)[NUM_WATERCANNONS];
+