From d822417cfce5ce0120481bd37271ebde6117b14c Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 13 Oct 2019 00:35:01 +0200 Subject: Fixes for nitpicks --- src/render/WaterCannon.cpp | 4 ++-- src/render/WaterCannon.h | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/render') diff --git a/src/render/WaterCannon.cpp b/src/render/WaterCannon.cpp index e477b3fa..c2af73f0 100644 --- a/src/render/WaterCannon.cpp +++ b/src/render/WaterCannon.cpp @@ -5,5 +5,5 @@ CWaterCannon* aCannons = (CWaterCannon*)0x8F2CA8; WRAPPER void CWaterCannons::Update(void) { EAXJMP(0x522510); } -WRAPPER void CWaterCannon::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); } -WRAPPER void CWaterCannon::Render(void) { EAXJMP(0x522550); } +WRAPPER void CWaterCannons::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); } +WRAPPER void CWaterCannons::Render(void) { EAXJMP(0x522550); } diff --git a/src/render/WaterCannon.h b/src/render/WaterCannon.h index 1b2dcee3..16df63db 100644 --- a/src/render/WaterCannon.h +++ b/src/render/WaterCannon.h @@ -10,12 +10,16 @@ public: CVector m_avecPos[16]; CVector m_avecVelocity[16]; char m_abUsed[16]; +}; + +static_assert(sizeof(CWaterCannon) == 412, "CWaterCannon: error"); - static void Update(void); +class CWaterCannons +{ +public: + static void Update(); static void UpdateOne(uint32 id, CVector *pos, CVector *dir); static void Render(void); }; -static_assert(sizeof(CWaterCannon) == 412, "CWaterCannon: error"); - -extern CWaterCannon* aCannons; +extern CWaterCannon *aCannons; -- cgit v1.2.3