# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2007-05-31 18:12:35
# Node ID adee51ded6c1b6540e342635d25a1bef90480c9e
# Parent  991b339378af98e9516125a7834020b2d5b46760

(svn r10004) -Fix: trams can always intersect/have junctions on one way roads (because they only work for busses and lorries).

diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -375,8 +375,8 @@ int32 CmdBuildRoad(TileIndex tile, uint3
 
 					existing = GetRoadBits(tile, rt);
 					RoadBits merged = existing | pieces;
-					bool crossing = (merged & ROAD_X) != ROAD_NONE && (merged & ROAD_Y) != ROAD_NONE;
-					if (GetDisallowedRoadDirections(tile) != DRD_NONE && crossing) {
+					bool crossing = (merged != ROAD_X && merged != ROAD_Y);
+					if (rt != ROADTYPE_TRAM && (GetDisallowedRoadDirections(tile) != DRD_NONE || toggle_drd != DRD_NONE) && crossing) {
 						/* Junctions cannot be one-way */
 						return_cmd_error(STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION);
 					}