From 7831346ef8924c757fbd763c225c7b29b665604f Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Mon, 2 Mar 2009 22:57:47 +0000
Subject: (svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner
 making it possible to remove someone's tram tracks. -Feature: allow building
 road stops on road/tram tracks of competitors.

---
 src/tunnel_map.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/tunnel_map.h')

diff --git a/src/tunnel_map.h b/src/tunnel_map.h
index 87abbea3c..b5e2e8a5d 100644
--- a/src/tunnel_map.h
+++ b/src/tunnel_map.h
@@ -9,7 +9,7 @@
 #include "rail_type.h"
 #include "road_type.h"
 #include "transport_type.h"
-#include "tile_map.h"
+#include "road_map.h"
 
 
 /**
@@ -50,9 +50,12 @@ static inline void MakeRoadTunnel(TileIndex t, Owner o, DiagDirection d, RoadTyp
 	SetTileType(t, MP_TUNNELBRIDGE);
 	SetTileOwner(t, o);
 	_m[t].m2 = 0;
-	_m[t].m3 = r;
+	_m[t].m3 = 0;
 	_m[t].m4 = 0;
 	_m[t].m5 = TRANSPORT_ROAD << 2 | d;
+	SetRoadOwner(t, ROADTYPE_ROAD, o);
+	if (o != OWNER_TOWN) SetRoadOwner(t, ROADTYPE_TRAM, o);
+	SetRoadTypes(t, r);
 }
 
 /**
-- 
cgit v1.2.3-54-g00ecf