From 4a8dd494ee1c75d6235295d37bc526b86f1ed410 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 7 May 2025 07:24:06 +0100 Subject: [PATCH] Codechange: Don't abbreviate TileLocationGroup type name. --- src/elrail.cpp | 10 +++++----- src/table/elrail_data.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/elrail.cpp b/src/elrail.cpp index 708d79539d..5bcadc0cbf 100644 --- a/src/elrail.cpp +++ b/src/elrail.cpp @@ -72,9 +72,9 @@ * @param t The tile to get the tile location group of. * @return The tile location group. */ -static inline TLG GetTLG(TileIndex t) +static inline TileLocationGroup GetTileLocationGroup(TileIndex t) { - return (TLG)((HasBit(TileX(t), 0) << 1) + HasBit(TileY(t), 0)); + return static_cast((GB(TileX(t), 0, 1) << 1) + GB(TileY(t), 0, 1)); } /** @@ -294,7 +294,7 @@ static void DrawRailCatenaryRailway(const TileInfo *ti) tileh[TS_HOME] = SLOPE_FLAT; } - TLG tlg = GetTLG(ti->tile); + TileLocationGroup tlg = GetTileLocationGroup(ti->tile); DiagDirections pcp_status{}; DiagDirections override_pcp{}; std::array ppp_preferred{}; @@ -425,7 +425,7 @@ static void DrawRailCatenaryRailway(const TileInfo *ti) if (ppp_allowed[i].Any() && pcp_status.Test(i) && !override_pcp.Test(i) && (!IsRailStationTile(ti->tile) || CanStationTileHavePylons(ti->tile))) { - const auto &ppp_orders = PPPorder[i][GetTLG(ti->tile)]; + const auto &ppp_orders = PPPorder[i][GetTileLocationGroup(ti->tile)]; for (Direction k = DIR_BEGIN; k < DIR_END; k++) { Direction temp = ppp_orders[k]; @@ -516,7 +516,7 @@ void DrawRailCatenaryOnBridge(const TileInfo *ti) const SortableSpriteStruct *sss; Axis axis = GetBridgeAxis(ti->tile); - TLG tlg = GetTLG(ti->tile); + TileLocationGroup tlg = GetTileLocationGroup(ti->tile); RailCatenarySprite offset = (RailCatenarySprite)(axis == AXIS_X ? 0 : WIRE_Y_FLAT_BOTH - WIRE_X_FLAT_BOTH); diff --git a/src/table/elrail_data.h b/src/table/elrail_data.h index 8f10e15563..efea4019ec 100644 --- a/src/table/elrail_data.h +++ b/src/table/elrail_data.h @@ -17,7 +17,7 @@ * Tile Location group. * This defines whether the X and or Y coordinate of a tile is even */ -enum TLG : uint8_t { +enum TileLocationGroup : uint8_t { XEVEN_YEVEN = 0, XEVEN_YODD = 1, XODD_YEVEN = 2,