Mercurial > hg > openttd
changeset 15178:7aa184b4f6c9 draft
(svn r19807) -Codechange: instead of having an unnamed enum and passing it as an int, name the enum and pass that
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Thu, 13 May 2010 08:56:01 +0000 |
| parents | 8cd2a5326ad4 |
| children | 93679004dc37 |
| files | src/main_gui.cpp src/viewport_func.h src/viewport_type.h |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -128,7 +128,7 @@ /* Zooms a viewport in a window in or out * No button handling or what so ever */ -bool DoZoomInOutWindow(int how, Window *w) +bool DoZoomInOutWindow(ZoomStateChange how, Window *w) { ViewPort *vp; @@ -136,6 +136,7 @@ vp = w->viewport; switch (how) { + case ZOOM_NONE: NOT_REACHED(); case ZOOM_IN: if (vp->zoom == ZOOM_LVL_MIN) return false; vp->zoom = (ZoomLevel)((int)vp->zoom - 1);
--- a/src/viewport_func.h +++ b/src/viewport_func.h @@ -35,12 +35,12 @@ */ void MarkAllViewportsDirty(int left, int top, int right, int bottom); -bool DoZoomInOutWindow(int how, Window *w); +bool DoZoomInOutWindow(ZoomStateChange how, Window *w); void ZoomInOrOutToCursorWindow(bool in, Window * w); Point GetTileZoomCenterWindow(bool in, Window * w); void HandleZoomMessage(Window *w, const ViewPort *vp, byte widget_zoom_in, byte widget_zoom_out); -static inline void MaxZoomInOut(int how, Window *w) +static inline void MaxZoomInOut(ZoomStateChange how, Window *w) { while (DoZoomInOutWindow(how, w)) {}; }