Merge branch 'master' into jgrpp

This commit is contained in:
Jonathan G Rennison
2019-10-12 00:45:01 +01:00
11 changed files with 107 additions and 18 deletions

View File

@@ -3080,9 +3080,8 @@ static void DrawTile_Track(TileInfo *ti)
if (image != SPR_FLAT_GRASS_TILE) image += rti->GetRailtypeSpriteOffset();
}
/* adjust ground tile for desert
* don't adjust for snow, because snow in depots looks weird */
if (IsSnowRailGround(ti->tile) && _settings_game.game_creation.landscape == LT_TROPIC) {
/* Adjust ground tile for desert and snow. */
if (IsSnowRailGround(ti->tile)) {
if (image != SPR_FLAT_GRASS_TILE) {
image += rti->snow_offset; // tile with tracks
} else {