cpp/openttd-patchpack/source Changeset - r8356:1852675e132d

Changeset - r8356:1852675e132d

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 16 years ago 2008-01-18 21:44:20
smatz@openttd.org

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

1 file changed with 17 insertions and 6 deletions:

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -1704,6 +1704,21 @@ void UpdateLevelCrossing(TileIndex tile, @@
 /**
  * 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.
  * Needs to be called once before the train is reversed, and once after it.
  * @param v First vehicle in chain
@@ @@ -1780,7 +1795,7 @@ static void ReverseTrainDirection(Vehicl @@
 	/* maybe we are approaching crossing now, after reversal */
 	crossing = TrainApproachingCrossingTile(v);
-	if (crossing != INVALID_TILE) UpdateLevelCrossing(crossing);
+	if (crossing != INVALID_TILE) MaybeBarCrossingWithSound(crossing);
+}
 /** Reverse train.
@@ @@ -3459,11 +3474,7 @@ static bool TrainCheckIfLineEnds(Vehicle @@
 	if ((ts & (ts >> 16)) != 0) return TrainApproachingLineEnd(v, true);
 	/* approaching a rail/road crossing? then make it red */
 	if (IsLevelCrossingTile(tile) && !IsCrossingBarred(tile)) {
 		BarCrossing(tile);
 		SndPlayTileFx(SND_0E_LEVEL_CROSSING, tile);
 		MarkTileDirtyByTile(tile);
+	}
 	if (IsLevelCrossingTile(tile)) MaybeBarCrossingWithSound(tile);
 	return true;
+}

0 comments (0 inline, 0 general)