Merge branch 'master' into jgrpp-nrt

Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp

src/tunnelbridge.h

@@ -13,6 +13,7 @@
 #define TUNNELBRIDGE_H
 
 #include "map_func.h"
+#include "tile_map.h"
 
 void MarkBridgeDirty(TileIndex begin, TileIndex end, DiagDirection direction, uint bridge_height, const ZoomLevel mark_dirty_if_zoomlevel_is_below = ZOOM_LVL_END);
 void MarkBridgeDirty(TileIndex tile, const ZoomLevel mark_dirty_if_zoomlevel_is_below = ZOOM_LVL_END);
@@ -36,6 +37,18 @@ static inline uint GetTunnelBridgeLength(TileIndex begin, TileIndex end)
 	return abs(x2 + y2 - x1 - y1) - 1;
 }
 
+/**
+ * Sets the ownership of the bridge/tunnel ramps
+ * @param begin The begin of the tunnel or bridge.
+ * @param end   The end of the tunnel or bridge.
+ * @param owner The new owner to set
+ */
+static inline void SetTunnelBridgeOwner(TileIndex begin, TileIndex end, Owner owner)
+{
+	SetTileOwner(begin, owner);
+	SetTileOwner(end, owner);
+}
+
 extern TileIndex _build_tunnel_endtile;
 
 #endif /* TUNNELBRIDGE_H */