From 2db0d81cc15dd887b32e6d85d6fb5022300c0c1b Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 30 May 2007 20:13:58 +0000 Subject: [PATCH] (svn r9991) -Fix: one could build road when trams were driving on the tile and vice versa. --- src/road_cmd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index b0bd6ec6fe..7586a9f49c 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -361,6 +361,8 @@ int32 CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) 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 @@ int32 CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if ((existing & pieces) == pieces) { return_cmd_error(STR_1007_ALREADY_BUILT); } - if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; break; case ROAD_TILE_CROSSING: