mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r13966) -Codechange [YAPP]: Bar level crossings upon path reservation. (michi_cc)

This commit is contained in:
rubidium 2008-08-02 22:57:18 +00:00
parent 88b1ee0b43
commit bba8ff290e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pbs.cpp
View File

@ -101,6 +101,8 @@ bool TryReserveRailTrack(TileIndex tile, Track t)
case MP_ROAD:
if (IsLevelCrossing(tile) && !GetCrossingReservation(tile)) {
SetCrossingReservation(tile, true);
BarCrossing(tile);
MarkTileDirtyByTile(tile);
return true;
}
break;
@ -149,7 +151,10 @@ bool TryReserveRailTrack(TileIndex tile, Track t)
break;
case MP_ROAD:
if (IsLevelCrossing(tile)) SetCrossingReservation(tile, false);
if (IsLevelCrossing(tile)) {
SetCrossingReservation(tile, false);
UpdateLevelCrossing(tile);
}
break;
case MP_STATION:

8
src/train_cmd.cpp
View File

@ -1773,8 +1773,8 @@ void UpdateLevelCrossing(TileIndex tile, bool sound)
{
assert(IsLevelCrossingTile(tile));
/* train on crossing || train approaching crossing */
bool new_state = VehicleFromPos(tile, NULL, &TrainOnTileEnum) != NULL || TrainApproachingCrossing(tile);
/* train on crossing || train approaching crossing || reserved */
bool new_state = VehicleFromPos(tile, NULL, &TrainOnTileEnum) != NULL || TrainApproachingCrossing(tile) || GetCrossingReservation(tile);
if (new_state != IsCrossingBarred(tile)) {
if (new_state && sound) {
@ -3734,6 +3734,10 @@ static void TrainController(Vehicle *v, Vehicle *nomove, bool update_image)
if (IsFrontEngine(v)) {
v->load_unload_time_rem = 0;
/* If we are approching a crossing that is reserved, play the sound now. */
TileIndex crossing = TrainApproachingCrossingTile(v);
if (crossing != INVALID_TILE && GetCrossingReservation(crossing)) SndPlayTileFx(SND_0E_LEVEL_CROSSING, crossing);
/* Always try to extend the reservation when entering a tile. */
CheckNextTrainTile(v);
}