src/zoom.hpp
changeset 7149 ba2798e551a3
parent 7124 b45674a97d9e
child 7200 eb3c2fb81091
--- a/src/zoom.hpp	Sat May 19 22:37:24 2007 +0000
+++ b/src/zoom.hpp	Sat May 19 22:48:04 2007 +0000
@@ -10,6 +10,8 @@
 	ZOOM_LVL_NORMAL = 0,
 	ZOOM_LVL_OUT_2X,
 	ZOOM_LVL_OUT_4X,
+	ZOOM_LVL_OUT_8X,
+	ZOOM_LVL_OUT_16X,
 	ZOOM_LVL_END,
 
 	/* Here we define in which zoom viewports are */
@@ -26,19 +28,21 @@
 	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,
+	ZOOM_LVL_MAX      = ZOOM_LVL_OUT_16X,
 };
 
 extern ZoomLevel _saved_scrollpos_zoom;
 
 static inline int ScaleByZoom(int value, ZoomLevel zoom)
 {
+	if (zoom == ZOOM_LVL_NORMAL) return value;
 	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)
 {
+	if (zoom == ZOOM_LVL_NORMAL) return value;
 	int izoom = (int)zoom - (int)ZOOM_LVL_NORMAL;
 	return (zoom > ZOOM_LVL_NORMAL) ? value >> izoom : value << izoom;
 }