changeset 13855:cf7f21e56f62 draft

(svn r18384) -Fix (r18351): attempt to 'work around' MSVC's IMO stupid warning
author rubidium <rubidium@openttd.org>
date Wed, 02 Dec 2009 18:14:34 +0000
parents f0479d827ebf
children 8c8d1ebf7ae1
files src/saveload/misc_sl.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/saveload/misc_sl.cpp
+++ b/src/saveload/misc_sl.cpp
@@ -52,7 +52,7 @@
 	w->viewport->dest_scrollpos_y = _saved_scrollpos_y;
 
 	ViewPort *vp = w->viewport;
-	vp->zoom = min<ZoomLevel>(_saved_scrollpos_zoom, ZOOM_LVL_MAX);
+	vp->zoom = (ZoomLevel)min(_saved_scrollpos_zoom, ZOOM_LVL_MAX);
 	vp->virtual_width = ScaleByZoom(vp->width, vp->zoom);
 	vp->virtual_height = ScaleByZoom(vp->height, vp->zoom);