mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r19807) -Codechange: instead of having an unnamed enum and passing it as an int, name the enum and pass that

release/1.1
rubidium 2010-05-13 08:56:01 +00:00
parent d568a4258b
commit 3118292b14
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main_gui.cpp
View File

@ -128,7 +128,7 @@ void ShowNetworkGiveMoneyWindow(CompanyID company)
/* Zooms a viewport in a window in or out /* Zooms a viewport in a window in or out
* No button handling or what so ever */ * No button handling or what so ever */
bool DoZoomInOutWindow(int how, Window *w) bool DoZoomInOutWindow(ZoomStateChange how, Window *w)
{ {
ViewPort *vp; ViewPort *vp;
@ -136,6 +136,7 @@ bool DoZoomInOutWindow(int how, Window *w)
vp = w->viewport; vp = w->viewport;
switch (how) { switch (how) {
case ZOOM_NONE: NOT_REACHED();
case ZOOM_IN: case ZOOM_IN:
if (vp->zoom == ZOOM_LVL_MIN) return false; if (vp->zoom == ZOOM_LVL_MIN) return false;
vp->zoom = (ZoomLevel)((int)vp->zoom - 1); vp->zoom = (ZoomLevel)((int)vp->zoom - 1);

4
src/viewport_func.h
View File

@ -35,12 +35,12 @@ void UpdateViewportPosition(Window *w);
*/ */
void MarkAllViewportsDirty(int left, int top, int right, int bottom); 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); void ZoomInOrOutToCursorWindow(bool in, Window * w);
Point GetTileZoomCenterWindow(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); 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)) {}; while (DoZoomInOutWindow(how, w)) {};
} }

2
src/viewport_type.h
View File

@ -51,7 +51,7 @@ struct ViewportSign {
void MarkDirty() const; void MarkDirty() const;
}; };
enum { enum ZoomStateChange {
ZOOM_IN = 0, ZOOM_IN = 0,
ZOOM_OUT = 1, ZOOM_OUT = 1,
ZOOM_NONE = 2, // hack, used to update the button status ZOOM_NONE = 2, // hack, used to update the button status