From 7c425ac4ac17788b2a00bab7e9c4a1f1556d292f Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Tue, 25 Feb 2020 18:24:45 +0100
Subject: Implement ProcessGarages + small cleanup

---
 src/render/WaterCannon.cpp | 2 +-
 src/render/WaterCannon.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/render')

diff --git a/src/render/WaterCannon.cpp b/src/render/WaterCannon.cpp
index c2af73f0..81d91480 100644
--- a/src/render/WaterCannon.cpp
+++ b/src/render/WaterCannon.cpp
@@ -2,7 +2,7 @@
 #include "patcher.h"
 #include "WaterCannon.h"
 
-CWaterCannon* aCannons = (CWaterCannon*)0x8F2CA8;
+CWaterCannon (&aCannons)[NUM_WATERCANNONS] = *(CWaterCannon(*)[NUM_WATERCANNONS])*(uintptr*)0x8F2CA8;
 
 WRAPPER void CWaterCannons::Update(void) { EAXJMP(0x522510); }
 WRAPPER void CWaterCannons::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); }
diff --git a/src/render/WaterCannon.h b/src/render/WaterCannon.h
index 16df63db..1d072f0c 100644
--- a/src/render/WaterCannon.h
+++ b/src/render/WaterCannon.h
@@ -22,4 +22,5 @@ public:
 	static void Render(void);
 };
 
-extern CWaterCannon *aCannons;
+extern CWaterCannon (&aCannons)[NUM_WATERCANNONS];
+
-- 
cgit v1.2.3