(svn r11910) -Fix: play 'ding-ding' crossing sound in more cases (except gameload and crossing construction)

-Fix: crossing sound is bound to tile, not to vehicle

1 files changed, 11 insertions, 8 deletions

diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 68c5080f2..ad6a8afe3 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -1683,20 +1683,23 @@ static Vehicle *TrainApproachingCrossing(TileIndex tile)
 /**
  * Sets correct crossing state
  * @param tile tile to update
+ * @param sound should we play sound?
  * @pre tile is a rail-road crossing
  */
-void UpdateLevelCrossing(TileIndex tile)
+void UpdateLevelCrossing(TileIndex tile, bool sound)
 {
 	assert(IsLevelCrossingTile(tile));
 
-	UnbarCrossing(tile);
-
 	/* train on crossing || train approaching crossing */
-	if (VehicleFromPos(tile, NULL, &TrainOnTileEnum) || TrainApproachingCrossing(tile)) {
-		BarCrossing(tile);
-	}
+	bool new_state = VehicleFromPos(tile, NULL, &TrainOnTileEnum) || TrainApproachingCrossing(tile);
 
-	MarkTileDirtyByTile(tile);
+	if (new_state != IsCrossingBarred(tile)) {
+		if (new_state && sound) {
+			SndPlayTileFx(SND_0E_LEVEL_CROSSING, tile);
+		}
+		SetCrossingBarred(tile, new_state);
+		MarkTileDirtyByTile(tile);
+	}
 }
 
 
@@ -3458,7 +3461,7 @@ static bool TrainCheckIfLineEnds(Vehicle *v)
 	/* approaching a rail/road crossing? then make it red */
 	if (IsLevelCrossingTile(tile) && !IsCrossingBarred(tile)) {
 		BarCrossing(tile);
-		SndPlayVehicleFx(SND_0E_LEVEL_CROSSING, v);
+		SndPlayTileFx(SND_0E_LEVEL_CROSSING, tile);
 		MarkTileDirtyByTile(tile);
 	}