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

Merge 38462627db into a46a3a97f3

SamuXarick 2025-06-24 07:00:00 +00:00 committed by GitHub
parent a46a3a97f3 38462627db
commit cc2121e707
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/tile_map.cpp
View File

@ -120,12 +120,14 @@ int GetTileZ(TileIndex tile)
uint x2 = std::min(x1 + 1, Map::MaxX());
uint y2 = std::min(y1 + 1, Map::MaxY());
return std::min({
TileHeight(tile), // N corner
TileHeight(TileXY(x2, y1)), // W corner
TileHeight(TileXY(x1, y2)), // E corner
TileHeight(TileXY(x2, y2)), // S corner
});
return std::min(
std::min(
TileHeight(tile), // N corner
TileHeight(TileXY(x2, y1))), // W corner
std::min(
TileHeight(TileXY(x1, y2)), // E corner
TileHeight(TileXY(x2, y2))) // S corner
);
}
/**
@ -140,10 +142,12 @@ int GetTileMaxZ(TileIndex t)
uint x2 = std::min(x1 + 1, Map::MaxX());
uint y2 = std::min(y1 + 1, Map::MaxY());
return std::max({
TileHeight(t), // N corner
TileHeight(TileXY(x2, y1)), // W corner
TileHeight(TileXY(x1, y2)), // E corner
TileHeight(TileXY(x2, y2)), // S corner
});
return std::max(
std::max(
TileHeight(t), // N corner
TileHeight(TileXY(x2, y1))), // W corner
std::max(
TileHeight(TileXY(x1, y2)), // E corner
TileHeight(TileXY(x2, y2))) // S corner
);
}