(svn r9991) -Fix: one could build road when trams were driving on the tile and vice versa.
authorrubidium
Wed, 30 May 2007 20:13:58 +0000
changeset 7252 9a5ca22a83c8
parent 7251 19f5ab36616e
child 7253 18dca03d0c67
(svn r9991) -Fix: one could build road when trams were driving on the tile and vice versa.
src/road_cmd.cpp
--- a/src/road_cmd.cpp	Wed May 30 18:24:54 2007 +0000
+++ b/src/road_cmd.cpp	Wed May 30 20:13:58 2007 +0000
@@ -361,6 +361,8 @@
 			switch (GetRoadTileType(tile)) {
 				case ROAD_TILE_NORMAL:
 					if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
+					if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
+
 					all_bits = GetAllRoadBits(tile);
 					if (!HASBIT(GetRoadTypes(tile), rt)) break;
 
@@ -368,7 +370,6 @@
 					if ((existing & pieces) == pieces) {
 						return_cmd_error(STR_1007_ALREADY_BUILT);
 					}
-					if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
 					break;
 
 				case ROAD_TILE_CROSSING: