gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change: Desert tiles are now half-desert if a neighboured tile is non-desert or sea/coast. (patch by frosch123) #4754 (#7015)

Browse Source
This commit is contained in:
Andy 2019-01-09 17:48:08 +00:00 committed by Ingo von Borstel
parent e934f09f02
commit ad5a9daed5
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/clear_cmd.cpp
View File

@ -208,16 +208,19 @@ static void TileLoopClearAlps(TileIndex tile)
}
/**
* Tests if at least one surrounding tile is desert
* Tests if at least one surrounding tile is non-desert
* @param tile tile to check
* @return does this tile have at least one desert tile around?
* @return does this tile have at least one non-desert tile around?
*/
static inline bool NeighbourIsDesert(TileIndex tile)
static inline bool NeighbourIsNormal(TileIndex tile)
{
return GetTropicZone(tile + TileDiffXY( 1, 0)) == TROPICZONE_DESERT ||
GetTropicZone(tile + TileDiffXY( -1, 0)) == TROPICZONE_DESERT ||
GetTropicZone(tile + TileDiffXY( 0, 1)) == TROPICZONE_DESERT ||
GetTropicZone(tile + TileDiffXY( 0, -1)) == TROPICZONE_DESERT;
for (DiagDirection dir = DIAGDIR_BEGIN; dir < DIAGDIR_END; dir++) {
TileIndex t = tile + TileOffsByDiagDir(dir);
if (!IsValidTile(t)) continue;
if (GetTropicZone(t) != TROPICZONE_DESERT) return true;
if (HasTileWaterClass(t) && GetWaterClass(t) == WATER_CLASS_SEA) return true;
}
return false;
}
static void TileLoopClearDesert(TileIndex tile)
@ -229,9 +232,7 @@ static void TileLoopClearDesert(TileIndex tile)
/* Expected desert level - 0 if it shouldn't be desert */
uint expected = 0;
if (GetTropicZone(tile) == TROPICZONE_DESERT) {
expected = 3;
} else if (NeighbourIsDesert(tile)) {
expected = 1;
expected = NeighbourIsNormal(tile) ? 1 : 3;
}
if (current == expected) return;