Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11922) -Codechange: use MaybeBarCrossingWithSound() to bar crossing with sound

Browse Source
This commit is contained in:
smatz 2008-01-18 21:44:20 +00:00
parent f6684c9afd
commit f05caedf7c
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/train_cmd.cpp
View File

@ -1703,6 +1703,21 @@ void UpdateLevelCrossing(TileIndex tile, bool sound)
} }
/**
* Bars crossing and plays ding-ding sound if not barred already
* @param tile tile with crossing
* @pre tile is a rail-road crossing
*/
static inline void MaybeBarCrossingWithSound(TileIndex tile)
{
if (!IsCrossingBarred(tile)) {
BarCrossing(tile);
SndPlayTileFx(SND_0E_LEVEL_CROSSING, tile);
MarkTileDirtyByTile(tile);
}
}
/** /**
* Advances wagons for train reversing, needed for variable length wagons. * Advances wagons for train reversing, needed for variable length wagons.
* Needs to be called once before the train is reversed, and once after it. * Needs to be called once before the train is reversed, and once after it.
@ -1780,7 +1795,7 @@ static void ReverseTrainDirection(Vehicle *v)
/* maybe we are approaching crossing now, after reversal */ /* maybe we are approaching crossing now, after reversal */
crossing = TrainApproachingCrossingTile(v); crossing = TrainApproachingCrossingTile(v);
if (crossing != INVALID_TILE) UpdateLevelCrossing(crossing); if (crossing != INVALID_TILE) MaybeBarCrossingWithSound(crossing);
} }
/** Reverse train. /** Reverse train.
@ -3459,11 +3474,7 @@ static bool TrainCheckIfLineEnds(Vehicle *v)
if ((ts & (ts >> 16)) != 0) return TrainApproachingLineEnd(v, true); if ((ts & (ts >> 16)) != 0) return TrainApproachingLineEnd(v, true);
/* approaching a rail/road crossing? then make it red */ /* approaching a rail/road crossing? then make it red */
if (IsLevelCrossingTile(tile) && !IsCrossingBarred(tile)) { if (IsLevelCrossingTile(tile)) MaybeBarCrossingWithSound(tile);
BarCrossing(tile);
SndPlayTileFx(SND_0E_LEVEL_CROSSING, tile);
MarkTileDirtyByTile(tile);
}
return true; return true;
} }