(svn r7583) -Fix (r7573): Merging of bridge branch broke (partially reverted?) automatic railtype conversion when building track on existing rail.
authorpeter1138
Wed, 27 Dec 2006 18:29:34 +0000
changeset 5582 0b1e6b9a1bdb
parent 5581 d0407b8e20ce
child 5583 ed718fa4c69c
(svn r7583) -Fix (r7573): Merging of bridge branch broke (partially reverted?) automatic railtype conversion when building track on existing rail.
rail_cmd.c
--- a/rail_cmd.c	Wed Dec 27 18:25:17 2006 +0000
+++ b/rail_cmd.c	Wed Dec 27 18:29:34 2006 +0000
@@ -253,7 +253,7 @@
 				return CMD_ERROR;
 			}
 			if (!IsTileOwner(tile, _current_player) ||
-					GetRailType(tile) != railtype) {
+					!IsCompatibleRail(GetRailType(tile), railtype)) {
 				// Get detailed error message
 				return DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 			}