(svn r9846) -Codechange: introduced ZOOM_LVL_MIN and ZOOM_LVL_MAX for the obvious reasons

-Codechange: introduced ZOOM_LVL_DETAIL to show/remove details
-Codechange: changed << and >> operator with ZoomLevel to a simple wrapper (that in theory also allows zoom-in besides the current zoom-out)
-Fix r9845: missed some int -> ZoomLevel

1 files changed, 17 insertions, 0 deletions

diff --git a/src/zoom.hpp b/src/zoom.hpp
index 64a2a1397..fc57b0139 100644
--- a/src/zoom.hpp
+++ b/src/zoom.hpp
@@ -22,8 +22,25 @@ enum ZoomLevel {
 	ZOOM_LVL_TRAIN    = ZOOM_LVL_NORMAL,
 	ZOOM_LVL_ROADVEH  = ZOOM_LVL_NORMAL,
 	ZOOM_LVL_WORLD_SCREENSHOT = ZOOM_LVL_NORMAL,
+
+	ZOOM_LVL_DETAIL   = ZOOM_LVL_OUT_2X, //! All zoomlevels below or equal to this, will result in details on the screen, like road-work, ...
+
+	ZOOM_LVL_MIN      = ZOOM_LVL_NORMAL,
+	ZOOM_LVL_MAX      = ZOOM_LVL_OUT_4X,
 };
 
 extern ZoomLevel _saved_scrollpos_zoom;
 
+static inline int ScaleByZoom(int value, ZoomLevel zoom)
+{
+	int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
+	return (zoom > ZOOM_LVL_NORMAL) ? value >> izoom : value << izoom;
+}
+
+static inline int UnScaleByZoom(int value, ZoomLevel zoom)
+{
+	int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
+	return (zoom > ZOOM_LVL_NORMAL) ? value << izoom : value >> izoom;
+}
+
 #endif /* ZOOM_HPP */