miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codefix f98b90ac2e: Use to_underlying instead of direct static_cast. (#14790)

Browse Source
This commit is contained in:
Peter Nelson
2025-11-17 18:12:27 +00:00
committed by dP
parent 97e4ed873f
commit b9fea4749c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tree_cmd.cpp
View File

@@ -676,7 +676,7 @@ static void DrawTile_Trees(TileInfo *ti)
uint trees = GetTreeCount(ti->tile);
for (uint i = 0; i < trees; i++) {
SpriteID sprite = s[0].sprite + (i == trees - 1 ? static_cast<uint>(GetTreeGrowth(ti->tile)) : 3);
SpriteID sprite = s[0].sprite + (i == trees - 1 ? to_underlying(GetTreeGrowth(ti->tile)) : 3);
PaletteID pal = s[0].pal;
te[i].sprite = sprite;

4
src/tree_map.h
View File

@@ -226,7 +226,7 @@ inline void AddTreeGrowth(Tile t, int a)
inline void SetTreeGrowth(Tile t, TreeGrowthStage g)
{
assert(IsTileType(t, MP_TREES)); // XXX incomplete
SB(t.m5(), 0, 3, static_cast<uint>(g));
SB(t.m5(), 0, 3, to_underlying(g));
}
/**
@@ -249,7 +249,7 @@ inline void MakeTree(Tile t, TreeType type, uint count, TreeGrowthStage growth,
t.m2() = ground << 6 | density << 4 | 0;
t.m3() = type;
t.m4() = 0 << 5 | 0 << 2;
t.m5() = count << 6 | static_cast<uint>(growth);
t.m5() = count << 6 | to_underlying(growth);
SB(t.m6(), 2, 6, 0);
t.m7() = 0;
t.m8() = 0;