(svn r17347) [0.7] -Fix (r17346): backport r16350 too as it fixes stuff a bug introduced by r16349, which was needed for the fix of r17307.

This commit is contained in:
rubidium 2009-09-01 13:28:15 +00:00
parent ad2fbaddc1
commit 0a4299bdfd
2 changed files with 2 additions and 2 deletions

View File

@ -116,7 +116,7 @@ static TrackBits GetRailTrackBitsUniversal(TileIndex t, byte *override)
*/
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++) {

View File

@ -827,7 +827,7 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1,
/* 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;
}