From ead49fa84eb9109dc612ec15bd1ea61f5a6566b2 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Mon, 29 Jan 2018 20:25:56 +0100 Subject: [PATCH] Name Unk141E9DC as WaterHeight. --- src/openrct2/paint/Paint.h | 2 +- src/openrct2/paint/Supports.cpp | 6 +++--- src/openrct2/paint/tile_element/Surface.cpp | 2 +- src/openrct2/paint/tile_element/TileElement.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h index dbb3898dbd..11f3a586da 100644 --- a/src/openrct2/paint/Paint.h +++ b/src/openrct2/paint/Paint.h @@ -167,7 +167,7 @@ typedef struct paint_session rct_tile_element * TrackElementOnSameHeight; bool DidPassSurface; uint8 Unk141E9DB; - uint16 Unk141E9DC; + uint16 WaterHeight; uint32 TrackColours[4]; } paint_session; diff --git a/src/openrct2/paint/Supports.cpp b/src/openrct2/paint/Supports.cpp index 768483882a..997ff89734 100644 --- a/src/openrct2/paint/Supports.cpp +++ b/src/openrct2/paint/Supports.cpp @@ -431,7 +431,7 @@ bool wooden_a_supports_paint_setup(paint_session * session, sint32 supportType, // Draw repeated supports for left over space while (height != 0) { - if ((z & 16) == 0 && height >= 2 && z + 16 != session->Unk141E9DC) { + if ((z & 16) == 0 && height >= 2 && z + 16 != session->WaterHeight) { // Full support sint32 imageId = WoodenSupportImageIds[supportType].full | imageColourFlags; uint8 ah = height == 2 ? 23 : 28; @@ -600,7 +600,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType, if (!skipTo663004) { while (heightSteps > 0) { - if (baseHeight & 0x10 || heightSteps == 1 || baseHeight + 16 == session->Unk141E9DC) { + if (baseHeight & 0x10 || heightSteps == 1 || baseHeight + 16 == session->WaterHeight) { sub_98196C(session, WoodenSupportImageIds[supportType].half | imageColourFlags, 0, 0, @@ -1138,7 +1138,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si } while (heightSteps > 0) { - if (baseHeight & 0x10 || heightSteps == 1 || baseHeight + 16 == session->Unk141E9DC) { + if (baseHeight & 0x10 || heightSteps == 1 || baseHeight + 16 == session->WaterHeight) { uint32 imageId = (supportType * 24) + pathEntry->bridge_image + 23; diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Surface.cpp index bfe4c2c03b..94a894e353 100644 --- a/src/openrct2/paint/tile_element/Surface.cpp +++ b/src/openrct2/paint/tile_element/Surface.cpp @@ -1354,7 +1354,7 @@ void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_ if (!gTrackDesignSaveMode) { - session->Unk141E9DC = waterHeight; + session->WaterHeight = waterHeight; sint32 image_offset = 0; if (waterHeight <= localHeight) diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/TileElement.cpp index e39bba0a72..ab3748244a 100644 --- a/src/openrct2/paint/tile_element/TileElement.cpp +++ b/src/openrct2/paint/tile_element/TileElement.cpp @@ -60,7 +60,7 @@ void tile_element_paint_setup(paint_session * session, sint32 x, sint32 y) paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_force_set_general_support_height(session, -1, 0); session->Unk141E9DB = 0; - session->Unk141E9DC = 0xFFFF; + session->WaterHeight = 0xFFFF; sub_68B3FB(session, x, y); } else { @@ -82,7 +82,7 @@ void sub_68B2B7(paint_session * session, sint32 x, sint32 y) ) { paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0); paint_util_force_set_general_support_height(session, -1, 0); - session->Unk141E9DC = 0xFFFF; + session->WaterHeight = 0xFFFF; session->Unk141E9DB = G141E9DB_FLAG_2; sub_68B3FB(session, x, y);