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.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); }