Merge tag '13.0-beta2' into jgrpp

# Conflicts:
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/depot_gui.cpp
#	src/error_gui.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/misc_gui.cpp
#	src/network/network_content_gui.h
#	src/newgrf_debug_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/water_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h

src/zoom_func.h

@@ -99,6 +99,16 @@ static inline ZoomLevel UnScaleZoomGUI(ZoomLevel value)
 	return std::clamp(ZoomLevel(value - (ZOOM_LVL_GUI - ZOOM_LVL_OUT_4X)), ZOOM_LVL_MIN, ZOOM_LVL_MAX);
 }
 
+/**
+ * Scale traditional pixel dimensions to GUI zoom level, for drawing sprites.
+ * @param value Pixel amount at #ZOOM_LVL_BASE (traditional "normal" interface size).
+ * @return Pixel amount at #ZOOM_LVL_GUI (current interface size).
+ */
+static inline int ScaleSpriteTrad(int value)
+{
+	return UnScaleGUI(value * ZOOM_LVL_BASE);
+}
+
 /**
  * Scale traditional pixel dimensions to GUI zoom level.
  * @param value Pixel amount at #ZOOM_LVL_BASE (traditional "normal" interface size).
@@ -106,27 +116,7 @@ static inline ZoomLevel UnScaleZoomGUI(ZoomLevel value)
  */
 static inline int ScaleGUITrad(int value)
 {
-	return UnScaleGUI(value * ZOOM_LVL_BASE);
-}
-
-/**
- * Short-hand to apply font zoom level.
- * @param value Pixel amount at #ZOOM_LVL_BEGIN (full zoom in).
- * @return Pixel amount at #ZOOM_LVL_FONT (current interface size).
- */
-static inline int UnScaleFont(int value)
-{
-	return UnScaleByZoom(value, ZOOM_LVL_FONT);
-}
-
-/**
- * Scale traditional pixel dimensions to Font zoom level.
- * @param value Pixel amount at #ZOOM_LVL_BASE (traditional "normal" interface size).
- * @return Pixel amount at #ZOOM_LVL_FONT (current interface size).
- */
-static inline int ScaleFontTrad(int value)
-{
-	return UnScaleFont(value * ZOOM_LVL_BASE);
+	return value * _gui_scale / 100;
 }
 
 #endif /* ZOOM_FUNC_H */