diff options
| author | truelight <truelight@openttd.org> | 2007-05-15 14:08:39 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2007-05-15 14:08:39 +0000 |
| commit | d3f375231f194f0d29ac4020337cfafd46ede9bf (patch) | |
| tree | 8be72fe02f196559ceab115af10a4a7e142fc46a /src/main_gui.cpp | |
| parent | 196ddae1db750e9e502bf972352f2cee747100aa (diff) | |
| download | openttd-d3f375231f194f0d29ac4020337cfafd46ede9bf.tar.xz | |
(svn r9844) -Codechange: replace zoomlevel with an enum
-Codechange: use predefined enums for viewport zoomlevels
Diffstat (limited to 'src/main_gui.cpp')
| -rw-r--r-- | src/main_gui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp index d6be058fd..b090e69df 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -880,8 +880,8 @@ bool DoZoomInOutWindow(int how, Window *w) switch (how) { case ZOOM_IN: - if (vp->zoom == 0) return false; - vp->zoom--; + if (vp->zoom == ZOOM_LVL_NORMAL) return false; + vp->zoom = (ZoomLevel)((byte)vp->zoom - 1); vp->virtual_width >>= 1; vp->virtual_height >>= 1; @@ -889,8 +889,8 @@ bool DoZoomInOutWindow(int how, Window *w) WP(w,vp_d).scrollpos_y += vp->virtual_height >> 1; break; case ZOOM_OUT: - if (vp->zoom == 2) return false; - vp->zoom++; + if (vp->zoom == ZOOM_LVL_OUT_4X) return false; + vp->zoom = (ZoomLevel)((byte)vp->zoom + 1); WP(w,vp_d).scrollpos_x -= vp->virtual_width >> 1; WP(w,vp_d).scrollpos_y -= vp->virtual_height >> 1; @@ -1049,7 +1049,7 @@ void ZoomInOrOutToCursorWindow(bool in, Window *w) vp = w->viewport; if (_game_mode != GM_MENU) { - if ((in && vp->zoom == 0) || (!in && vp->zoom == 2)) + if ((in && vp->zoom == ZOOM_LVL_NORMAL) || (!in && vp->zoom == ZOOM_LVL_OUT_4X)) return; pt = GetTileZoomCenterWindow(in,w); @@ -2460,7 +2460,7 @@ void SetupColorsAndInitialWindow() height = _screen.height; w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL); - AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), 0); + AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), ZOOM_LVL_VIEWPORT); /* XXX: these are not done */ switch (_game_mode) { |