Mercurial > hg > openttd

changeset 11947:5af9f5ff05d3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r16350) -Codechange: make some 'rail track is present' checks more 'secure'
author smatz <smatz@openttd.org>
date Mon, 18 May 2009 01:35:15 +0000
parents d5716f5a9844
children ad1ecf6b26e4
files src/elrail.cpp src/rail_cmd.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -116,7 +116,7 @@
  */
 static TrackBits MaskWireBits(TileIndex t, TrackBits tracks)
 {
-	if (!IsPlainRail(t)) return tracks;
+	if (!IsPlainRailTile(t)) return tracks;
 
 	TrackdirBits neighbour_tdb = TRACKDIR_BIT_NONE;
 	for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) {
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -827,7 +827,7 @@
 
 	/* You can only build signals on plain rail tiles, and the selected track must exist */
 	if (!ValParamTrackOrientation(track) || !IsPlainRailTile(tile) ||
-			!EnsureNoTrainOnTrack(tile, track) || !HasTrack(tile, track)) {
+			!HasTrack(tile, track) || !EnsureNoTrainOnTrack(tile, track)) {
 		return CMD_ERROR;
 	}