changeset 10707 | 81a4013a7680 |
parent 10703 | 2c998f3776d1 |
child 10775 | 7061477bfbcf |
10706:2526a335ff62 | 10707:81a4013a7680 |
---|---|
1418 return GetSlopeZ(x, y); |
1418 return GetSlopeZ(x, y); |
1419 } |
1419 } |
1420 |
1420 |
1421 static void DrawSingleSignal(TileIndex tile, Track track, byte condition, uint image, uint pos) |
1421 static void DrawSingleSignal(TileIndex tile, Track track, byte condition, uint image, uint pos) |
1422 { |
1422 { |
1423 bool side = (_opt.road_side != 0) && _settings.construction.signal_side; |
1423 bool side = (_settings.vehicle.road_side != 0) && _settings.construction.signal_side; |
1424 static const Point SignalPositions[2][12] = { |
1424 static const Point SignalPositions[2][12] = { |
1425 { /* Signals on the left side */ |
1425 { /* Signals on the left side */ |
1426 /* LEFT LEFT RIGHT RIGHT UPPER UPPER */ |
1426 /* LEFT LEFT RIGHT RIGHT UPPER UPPER */ |
1427 { 8, 5}, {14, 1}, { 1, 14}, { 9, 11}, { 1, 0}, { 3, 10}, |
1427 { 8, 5}, {14, 1}, { 1, 14}, { 9, 11}, { 1, 0}, { 3, 10}, |
1428 /* LOWER LOWER X X Y Y */ |
1428 /* LOWER LOWER X X Y Y */ |
1787 image = dts->ground.sprite; |
1787 image = dts->ground.sprite; |
1788 if (image != SPR_FLAT_GRASS_TILE) image += rti->total_offset; |
1788 if (image != SPR_FLAT_GRASS_TILE) image += rti->total_offset; |
1789 |
1789 |
1790 /* adjust ground tile for desert |
1790 /* adjust ground tile for desert |
1791 * don't adjust for snow, because snow in depots looks weird */ |
1791 * don't adjust for snow, because snow in depots looks weird */ |
1792 if (IsSnowRailGround(ti->tile) && _opt.landscape == LT_TROPIC) { |
1792 if (IsSnowRailGround(ti->tile) && _settings.game_creation.landscape == LT_TROPIC) { |
1793 if (image != SPR_FLAT_GRASS_TILE) { |
1793 if (image != SPR_FLAT_GRASS_TILE) { |
1794 image += rti->snow_offset; // tile with tracks |
1794 image += rti->snow_offset; // tile with tracks |
1795 } else { |
1795 } else { |
1796 image = SPR_FLAT_SNOWY_TILE; // flat ground |
1796 image = SPR_FLAT_SNOWY_TILE; // flat ground |
1797 } |
1797 } |
1951 if (old_ground == RAIL_GROUND_WATER) { |
1951 if (old_ground == RAIL_GROUND_WATER) { |
1952 TileLoop_Water(tile); |
1952 TileLoop_Water(tile); |
1953 return; |
1953 return; |
1954 } |
1954 } |
1955 |
1955 |
1956 switch (_opt.landscape) { |
1956 switch (_settings.game_creation.landscape) { |
1957 case LT_ARCTIC: { |
1957 case LT_ARCTIC: { |
1958 uint z; |
1958 uint z; |
1959 Slope slope = GetTileSlope(tile, &z); |
1959 Slope slope = GetTileSlope(tile, &z); |
1960 bool half = false; |
1960 bool half = false; |
1961 |
1961 |