mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Don't abbreviate TileLocationGroup type name.

pull/14236/head
Peter Nelson 2025-05-07 07:24:06 +01:00 committed by Peter Nelson
parent d00196cd65
commit 4a8dd494ee
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/elrail.cpp
View File

@ -72,9 +72,9 @@
* @param t The tile to get the tile location group of. * @param t The tile to get the tile location group of.
* @return The tile location group. * @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<TileLocationGroup>((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; tileh[TS_HOME] = SLOPE_FLAT;
} }
TLG tlg = GetTLG(ti->tile); TileLocationGroup tlg = GetTileLocationGroup(ti->tile);
DiagDirections pcp_status{}; DiagDirections pcp_status{};
DiagDirections override_pcp{}; DiagDirections override_pcp{};
std::array<Directions, DIAGDIR_END> ppp_preferred{}; std::array<Directions, DIAGDIR_END> 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) && if (ppp_allowed[i].Any() && pcp_status.Test(i) && !override_pcp.Test(i) &&
(!IsRailStationTile(ti->tile) || CanStationTileHavePylons(ti->tile))) { (!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++) { for (Direction k = DIR_BEGIN; k < DIR_END; k++) {
Direction temp = ppp_orders[k]; Direction temp = ppp_orders[k];
@ -516,7 +516,7 @@ void DrawRailCatenaryOnBridge(const TileInfo *ti)
const SortableSpriteStruct *sss; const SortableSpriteStruct *sss;
Axis axis = GetBridgeAxis(ti->tile); 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); RailCatenarySprite offset = (RailCatenarySprite)(axis == AXIS_X ? 0 : WIRE_Y_FLAT_BOTH - WIRE_X_FLAT_BOTH);

2
src/table/elrail_data.h
View File

@ -17,7 +17,7 @@
* Tile Location group. * Tile Location group.
* This defines whether the X and or Y coordinate of a tile is even * 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_YEVEN = 0,
XEVEN_YODD = 1, XEVEN_YODD = 1,
XODD_YEVEN = 2, XODD_YEVEN = 2,