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/widgets/autoreplace_widget.h

@@ -34,9 +34,11 @@ enum ReplaceVehicleWidgets {
 	WID_RV_INFO_TAB,                 ///< Info tab.
 	WID_RV_STOP_REPLACE,             ///< Stop Replacing button.
 
+	/* Train/road only widgets */
+	WID_RV_RAIL_ROAD_TYPE_DROPDOWN,  ///< Dropdown menu about the rail/roadtype.
+
 	/* Train only widgets. */
 	WID_RV_TRAIN_ENGINEWAGON_DROPDOWN, ///< Dropdown to select engines and/or wagons.
-	WID_RV_TRAIN_RAILTYPE_DROPDOWN,  ///< Dropdown menu about the railtype.
 	WID_RV_TRAIN_WAGONREMOVE_TOGGLE, ///< Button to toggle removing wagons.
 };
 

src/widgets/company_widget.h

@@ -180,6 +180,8 @@ enum CompanyInfrastructureWidgets {
 	WID_CI_RAIL_COUNT,    ///< Count of rail.
 	WID_CI_ROAD_DESC,     ///< Description of road.
 	WID_CI_ROAD_COUNT,    ///< Count of road.
+	WID_CI_TRAM_DESC,     ///< Description of tram.
+	WID_CI_TRAM_COUNT,    ///< Count of tram.
 	WID_CI_WATER_DESC,    ///< Description of water.
 	WID_CI_WATER_COUNT,   ///< Count of water.
 	WID_CI_STATION_DESC,  ///< Description of station.

src/widgets/road_widget.h

@@ -15,6 +15,7 @@
 /** Widgets of the #BuildRoadToolbarWindow class. */
 enum RoadToolbarWidgets {
 	/* Name starts with RO instead of R, because of collision with RailToolbarWidgets */
+	WID_ROT_CAPTION,        ///< Caption of the window
 	WID_ROT_ROAD_X,         ///< Build road in x-direction.
 	WID_ROT_ROAD_Y,         ///< Build road in y-direction.
 	WID_ROT_AUTOROAD,       ///< Autorail.
@@ -26,6 +27,7 @@ enum RoadToolbarWidgets {
 	WID_ROT_BUILD_BRIDGE,   ///< Build bridge.
 	WID_ROT_BUILD_TUNNEL,   ///< Build tunnel.
 	WID_ROT_REMOVE,         ///< Remove road.
+	WID_ROT_CONVERT_ROAD,   ///< Convert road.
 };
 
 /** Widgets of the #BuildRoadDepotWindow class. */

src/widgets/toolbar_widget.h

@@ -39,6 +39,7 @@ enum ToolbarNormalWidgets {
 	WID_TN_BUILDING_TOOLS_START, ///< Helper for the offset of the building tools
 	WID_TN_RAILS         = WID_TN_BUILDING_TOOLS_START, ///< Rail building menu.
 	WID_TN_ROADS,         ///< Road building menu.
+	WID_TN_TRAMS,         ///< Tram building menu.
 	WID_TN_WATER,         ///< Water building toolbar.
 	WID_TN_AIR,           ///< Airport building toolbar.
 	WID_TN_LANDSCAPE,     ///< Landscaping toolbar.
@@ -66,6 +67,7 @@ enum ToolbarEditorWidgets {
 	WID_TE_TOWN_GENERATE, ///< Town building window.
 	WID_TE_INDUSTRY,      ///< Industry building window.
 	WID_TE_ROADS,         ///< Road building menu.
+	WID_TE_TRAMS,         ///< Tram building menu.
 	WID_TE_WATER,         ///< Water building toolbar.
 	WID_TE_TREES,         ///< Tree building toolbar.
 	WID_TE_SIGNS,         ///< Sign building.