diff options
| author | rubidium <rubidium@openttd.org> | 2011-11-04 10:25:58 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-11-04 10:25:58 +0000 |
| commit | 69162621d81c82b832cccc8d59179fc0e4472af2 (patch) | |
| tree | 84b0875823153321225331b2a4a5862a60fdc345 /src/rail_cmd.cpp | |
| parent | b167c0a3967a62b4cbe98a12f2c4d932ee8df510 (diff) | |
| download | openttd-69162621d81c82b832cccc8d59179fc0e4472af2.tar.xz | |
(svn r23096) -Codechange: remove useless divisions and multiplications by TILE_HEIGHT for the snow line code
Diffstat (limited to 'src/rail_cmd.cpp')
| -rw-r--r-- | src/rail_cmd.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index 185a83556..10feedd6e 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -2367,7 +2367,7 @@ static void TileLoop_Track(TileIndex tile) switch (_settings_game.game_creation.landscape) { case LT_ARCTIC: { uint z; - Slope slope = GetTilePixelSlope(tile, &z); + Slope slope = GetTileSlope(tile, &z); bool half = false; /* for non-flat track, use lower part of track @@ -2379,31 +2379,31 @@ static void TileLoop_Track(TileIndex tile) switch (f) { case FOUNDATION_NONE: /* no foundation - is the track on the upper side of three corners raised tile? */ - if (IsSlopeWithThreeCornersRaised(slope)) z += TILE_HEIGHT; + if (IsSlopeWithThreeCornersRaised(slope)) z++; break; case FOUNDATION_INCLINED_X: case FOUNDATION_INCLINED_Y: /* sloped track - is it on a steep slope? */ - if (IsSteepSlope(slope)) z += TILE_HEIGHT; + if (IsSteepSlope(slope)) z++; break; case FOUNDATION_STEEP_LOWER: /* only lower part of steep slope */ - z += TILE_HEIGHT; + z++; break; default: /* if it is a steep slope, then there is a track on higher part */ - if (IsSteepSlope(slope)) z += TILE_HEIGHT; - z += TILE_HEIGHT; + if (IsSteepSlope(slope)) z++; + z++; break; } half = IsInsideMM(f, FOUNDATION_STEEP_BOTH, FOUNDATION_HALFTILE_N + 1); } else { /* is the depot on a non-flat tile? */ - if (slope != SLOPE_FLAT) z += TILE_HEIGHT; + if (slope != SLOPE_FLAT) z++; } /* 'z' is now the lowest part of the highest track bit - @@ -2411,7 +2411,7 @@ static void TileLoop_Track(TileIndex tile) * for two track bits, it is 'z' of higher track bit * For non-continuous foundations (and STEEP_BOTH), 'half' is set */ if (z > GetSnowLine()) { - if (half && z - GetSnowLine() == TILE_HEIGHT) { + if (half && z - GetSnowLine() == 1) { /* track on non-continuous foundation, lower part is not under snow */ new_ground = RAIL_GROUND_HALF_SNOW; } else { |