summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-12-02 18:14:34 +0000
committerrubidium <rubidium@openttd.org>2009-12-02 18:14:34 +0000
commit429f3993f8dc380780a23a6f46420797a9a8a11c (patch)
tree3f7f8f8cde613fb104ad6f7140c0dd681c5c3b25 /src
parent66da3cbb20bcaf29ed3b863c25b291527b56d44a (diff)
downloadopenttd-429f3993f8dc380780a23a6f46420797a9a8a11c.tar.xz
(svn r18384) -Fix (r18351): attempt to 'work around' MSVC's IMO stupid warning
Diffstat (limited to 'src')
-rw-r--r--src/saveload/misc_sl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp
index b6a4c5b9b..06775d4e9 100644
--- a/src/saveload/misc_sl.cpp
+++ b/src/saveload/misc_sl.cpp
@@ -52,7 +52,7 @@ void ResetViewportAfterLoadGame()
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);