Merge branch 'master' into jgrpp

# Conflicts:
#	src/landscape.cpp
#	src/landscape.h
#	src/misc_gui.cpp
#	src/newgrf_commons.cpp
#	src/order_cmd.cpp
#	src/pathfinder/yapf/yapf_base.hpp
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/water_cmd.cpp
#	src/window.cpp

src/table/newgrf_debug_data.h

@@ -2531,7 +2531,7 @@ class NIHNewLandscape : public NIHelper {
 		TileInfo ti;
 		ti.x = TileX(index);
 		ti.y = TileY(index);
-		ti.tileh = GetTilePixelSlope(index, &ti.z);
+		std::tie(ti.tileh, ti.z) = GetTilePixelSlope(index);
 		ti.tile = index;
 
 		NewLandscapeResolverObject ro(nullptr, &ti, NEW_LANDSCAPE_ROCKS);