summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2020-02-25 18:24:45 +0100
committerFilip Gawin <filip.gawin@zoho.com>2020-03-22 17:30:54 +0100
commit7c425ac4ac17788b2a00bab7e9c4a1f1556d292f (patch)
treef0319754a4e8f9638d39d1e43449eb6d8351c835 /src/render
parentImplement SetupJumboEngineSound (diff)
downloadre3-7c425ac4ac17788b2a00bab7e9c4a1f1556d292f.tar
re3-7c425ac4ac17788b2a00bab7e9c4a1f1556d292f.tar.gz
re3-7c425ac4ac17788b2a00bab7e9c4a1f1556d292f.tar.bz2
re3-7c425ac4ac17788b2a00bab7e9c4a1f1556d292f.tar.lz
re3-7c425ac4ac17788b2a00bab7e9c4a1f1556d292f.tar.xz
re3-7c425ac4ac17788b2a00bab7e9c4a1f1556d292f.tar.zst
re3-7c425ac4ac17788b2a00bab7e9c4a1f1556d292f.zip
Diffstat (limited to 'src/render')
-rw-r--r--src/render/WaterCannon.cpp2
-rw-r--r--src/render/WaterCannon.h3
2 files changed, 3 insertions, 2 deletions
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];
+