summaryrefslogtreecommitdiffstats
path: root/src/render/WaterLevel.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-12-15 14:36:30 +0100
committeraap <aap@papnet.eu>2020-12-15 14:36:30 +0100
commit6d3adf57e8968071d16de8746cebf366543039bb (patch)
treeab061b8ed29eb96f5bc15dea1bc7879d102ce959 /src/render/WaterLevel.h
parentMerge pull request #883 from withmorten/waterlevel (diff)
downloadre3-6d3adf57e8968071d16de8746cebf366543039bb.tar
re3-6d3adf57e8968071d16de8746cebf366543039bb.tar.gz
re3-6d3adf57e8968071d16de8746cebf366543039bb.tar.bz2
re3-6d3adf57e8968071d16de8746cebf366543039bb.tar.lz
re3-6d3adf57e8968071d16de8746cebf366543039bb.tar.xz
re3-6d3adf57e8968071d16de8746cebf366543039bb.tar.zst
re3-6d3adf57e8968071d16de8746cebf366543039bb.zip
Diffstat (limited to '')
-rw-r--r--src/render/WaterLevel.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/render/WaterLevel.h b/src/render/WaterLevel.h
index cff1a995..cf3537ae 100644
--- a/src/render/WaterLevel.h
+++ b/src/render/WaterLevel.h
@@ -1,7 +1,5 @@
#pragma once
-#define WATER_BLOCK_SIZE LARGE_SECTOR_SIZE
-#define WATER_FINEBLOCK_SIZE HUGE_SECTOR_SIZE
#define WATER_Z_OFFSET (1.5f)
#define NO_WATER -128
@@ -25,8 +23,6 @@
#define WATER_WIDTH ((WATER_END_X - WATER_START_X))
#define WATER_HEIGHT ((WATER_END_Y - WATER_START_Y))
-#define SMALL_SECTOR_WIDTH (WATER_WIDTH/MAX_SMALL_SECTORS)
-
#define WATER_UNSIGN_X(x) ( (x) + (WATER_WIDTH /2) )
#define WATER_UNSIGN_Y(y) ( (y) + (WATER_HEIGHT/2) )
#define WATER_SIGN_X(x) ( (x) - (WATER_WIDTH /2) )
@@ -75,8 +71,8 @@ class CWaterLevel
static int32 ms_nNoOfWaterLevels;
static float ms_aWaterZs[48];
static CRect ms_aWaterRects[48];
- static int8 aWaterBlockList[WATER_BLOCK_SIZE][WATER_BLOCK_SIZE];
- static int8 aWaterFineBlockList[WATER_FINEBLOCK_SIZE][WATER_FINEBLOCK_SIZE];
+ static int8 aWaterBlockList[MAX_LARGE_SECTORS][MAX_LARGE_SECTORS];
+ static int8 aWaterFineBlockList[MAX_SMALL_SECTORS][MAX_SMALL_SECTORS];
static bool WavesCalculatedThisFrame;
static RpAtomic *ms_pWavyAtomic;
static RpGeometry *apGeomArray[MAX_BOAT_WAKES];