From b90d670878c2b39f520232bef3e1d400b4b32cbc Mon Sep 17 00:00:00 2001
From: SamuXarick <43006711+SamuXarick@users.noreply.github.com>
Date: Mon, 23 Dec 2024 15:43:50 +0000
Subject: [PATCH] Codechange 4f9c10d: Water tile type reduced to 2 bits in the
map array
Also reword water tile type tooltips in the landscape_grid document.
---
docs/landscape_grid.html | 10 +++++-----
src/water_map.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html
index b2ee8293e2..d7c7326aa1 100644
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -246,7 +246,7 @@ the array so you can quickly see what is used and what is not.
| OOOO OOOO OOOO OOOO |
OOOO OOOX |
OOOO OOOO |
- 0000 OOO0 |
+ OOXX OOOO |
OOOO OOOO |
OOOO OOOO |
OOOO OOOO OOOO OOOO |
@@ -254,23 +254,23 @@ the array so you can quickly see what is used and what is not.
| canal, river |
XXXX XXXX |
- 0000 OOOO |
+ OOXX OOOO |
| shore |
OOOO OOOO |
- 0001 OOOO |
+ OOXX OOOO |
| lock |
OOOO OOOO |
- 0010 XXXX |
+ OOXX XXXX |
| shipdepot |
XXXX XXXX XXXX XXXX |
OOOO OOOO |
- 0011 OOXX |
+ OOXX OOXX |
| 8 |
diff --git a/src/water_map.h b/src/water_map.h
index c21029b670..bdc245f999 100644
--- a/src/water_map.h
+++ b/src/water_map.h
@@ -17,7 +17,7 @@
* Bit field layout of m5 for water tiles.
*/
static constexpr uint8_t WBL_TYPE_BEGIN = 4; ///< Start of the 'type' bitfield.
-static constexpr uint8_t WBL_TYPE_COUNT = 4; ///< Length of the 'type' bitfield.
+static constexpr uint8_t WBL_TYPE_COUNT = 2; ///< Length of the 'type' bitfield.
static constexpr uint8_t WBL_LOCK_ORIENT_BEGIN = 0; ///< Start of lock orientation bitfield.
static constexpr uint8_t WBL_LOCK_ORIENT_COUNT = 2; ///< Length of lock orientation bitfield.