mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-09-01 02:49:10 +00:00
Code Issues Activity

(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}

Browse Source
This commit is contained in:
tron
2006-04-23 19:35:36 +00:00
parent 8ef2c13c65
commit c1dc517dab
17 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
train_cmd.c
View File

@@ -2615,7 +2615,7 @@ static bool CheckCompatibleRail(const Vehicle *v, TileIndex tile)
Slope tileh = GetTileSlope(tile, &height);
// correct Z position of a train going under a bridge on slopes
if (CorrectZ(tileh)) height += 8;
if (CorrectZ(tileh)) height += TILE_HEIGHT;
if (v->z_pos != height) return true; // train is going over bridge
}
@@ -3236,7 +3236,7 @@ static bool TrainCheckIfLineEnds(Vehicle *v)
if (GB(ts, 0, 16) != 0) {
/* If we approach a rail-piece which we can't enter, or the back of a depot, don't enter it! */
if (x + 4 > 15 &&
if (x + 4 >= TILE_SIZE &&
(!CheckCompatibleRail(v, tile) ||
(IsTileDepotType(tile, TRANSPORT_RAIL) &&
GetRailDepotDirection(tile) == dir))) {
@@ -3255,7 +3255,7 @@ static bool TrainCheckIfLineEnds(Vehicle *v)
}
return true;
}
} else if (x + 4 > 15) {
} else if (x + 4 >= TILE_SIZE) {
v->cur_speed = 0;
ReverseTrainDirection(v);
return false;