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

Merge 38462627db into bd2430dc94

SamuXarick 2025-06-26 07:33:44 +00:00 committed by GitHub
parent bd2430dc94 38462627db
commit ec9aab3ff7
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 x2 = std::min(x1 + 1, Map::MaxX());
uint y2 = std::min(y1 + 1, Map::MaxY()); uint y2 = std::min(y1 + 1, Map::MaxY());
return std::min({ return std::min(
TileHeight(tile), // N corner std::min(
TileHeight(TileXY(x2, y1)), // W corner TileHeight(tile), // N corner
TileHeight(TileXY(x1, y2)), // E corner TileHeight(TileXY(x2, y1))), // W corner
TileHeight(TileXY(x2, y2)), // S 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 x2 = std::min(x1 + 1, Map::MaxX());
uint y2 = std::min(y1 + 1, Map::MaxY()); uint y2 = std::min(y1 + 1, Map::MaxY());
return std::max({ return std::max(
TileHeight(t), // N corner std::max(
TileHeight(TileXY(x2, y1)), // W corner TileHeight(t), // N corner
TileHeight(TileXY(x1, y2)), // E corner TileHeight(TileXY(x2, y1))), // W corner
TileHeight(TileXY(x2, y2)), // S corner std::max(
}); TileHeight(TileXY(x1, y2)), // E corner
TileHeight(TileXY(x2, y2))) // S corner
);
} }