From 47b111449bd613148fd0c3169178da987f8a1fd6 Mon Sep 17 00:00:00 2001 From: smatz Date: Wed, 5 Aug 2009 14:33:30 +0000 Subject: [PATCH] (svn r17071) -Fix: give a better error message when trying to make road one-way when it doesn't belong to you --- src/road_cmd.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 03c07bb405..f428898b09 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -489,9 +489,12 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 } if ((existing & pieces) == pieces) { /* We only want to set the (dis)allowed road directions */ - if (toggle_drd != DRD_NONE && rt != ROADTYPE_TRAM && IsRoadOwner(tile, ROADTYPE_ROAD, _current_company)) { + if (toggle_drd != DRD_NONE && rt != ROADTYPE_TRAM) { if (crossing) return_cmd_error(STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION); + Owner owner = GetRoadOwner(tile, ROADTYPE_ROAD); + if (owner != OWNER_NONE && !CheckOwnership(owner)) return CMD_ERROR; + if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; /* Ignore half built tiles */