diff options
| author | smatz <smatz@openttd.org> | 2008-01-17 19:49:06 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2008-01-17 19:49:06 +0000 |
| commit | b20d1eee6cb4bd7282f66a324dd65332de9d9ec1 (patch) | |
| tree | 34528ac5e4eacd82e0b40b87f08e3bae4aa5c964 /src/train_cmd.cpp | |
| parent | e0f759f71e82ce2c68438b91646e35c29b44d85b (diff) | |
| download | openttd-b20d1eee6cb4bd7282f66a324dd65332de9d9ec1.tar.xz | |
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
Diffstat (limited to 'src/train_cmd.cpp')
| -rw-r--r-- | src/train_cmd.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 7f1f23747..68c5080f2 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1685,7 +1685,7 @@ static Vehicle *TrainApproachingCrossing(TileIndex tile) * @param tile tile to update * @pre tile is a rail-road crossing */ -void UpdateTrainCrossing(TileIndex tile) +void UpdateLevelCrossing(TileIndex tile) { assert(IsLevelCrossingTile(tile)); @@ -1773,11 +1773,11 @@ static void ReverseTrainDirection(Vehicle *v) ClrBit(v->u.rail.flags, VRF_REVERSING); /* update crossing we were approaching */ - if (crossing != INVALID_TILE) UpdateTrainCrossing(crossing); + if (crossing != INVALID_TILE) UpdateLevelCrossing(crossing); /* maybe we are approaching crossing now, after reversal */ crossing = TrainApproachingCrossingTile(v); - if (crossing != INVALID_TILE) UpdateTrainCrossing(crossing); + if (crossing != INVALID_TILE) UpdateLevelCrossing(crossing); } /** Reverse train. @@ -2856,7 +2856,7 @@ static void SetVehicleCrashed(Vehicle *v) END_ENUM_WAGONS(v) /* must be updated after the train has been marked crashed */ - if (crossing != INVALID_TILE) UpdateTrainCrossing(crossing); + if (crossing != INVALID_TILE) UpdateLevelCrossing(crossing); } static uint CountPassengersInTrain(const Vehicle* v) @@ -3148,7 +3148,7 @@ static void TrainController(Vehicle *v, bool update_image) * (above) or the last vehicle moves. */ if (v->Next() == NULL) { TrainMovedChangeSignals(gp.old_tile, ReverseDiagDir(enterdir)); - if (IsLevelCrossingTile(gp.old_tile)) UpdateTrainCrossing(gp.old_tile); + if (IsLevelCrossingTile(gp.old_tile)) UpdateLevelCrossing(gp.old_tile); } } } @@ -3211,7 +3211,7 @@ static void DeleteLastWagon(Vehicle *v) v = NULL; // make sure nobody will won't try to read 'v' anymore /* check if the wagon was on a road/rail-crossing */ - if (IsLevelCrossingTile(tile)) UpdateTrainCrossing(tile); + if (IsLevelCrossingTile(tile)) UpdateLevelCrossing(tile); /* Update signals */ if (IsTileType(tile, MP_TUNNELBRIDGE) || IsTileDepotType(tile, TRANSPORT_RAIL)) { |