mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r13670) -Codechange : Merge some very alike events handlers.

This commit is contained in:
belugas 2008-07-01 00:04:09 +00:00
parent e9e453cf8b
commit ce721a579f
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/toolbar_gui.cpp
View File

@ -520,7 +520,7 @@ static void MenuClickShowAir(int index)
static void ToolbarZoomInClick(Window *w) static void ToolbarZoomInClick(Window *w)
{ {
if (DoZoomInOutWindow(ZOOM_IN, FindWindowById(WC_MAIN_WINDOW, 0))) { if (DoZoomInOutWindow(ZOOM_IN, FindWindowById(WC_MAIN_WINDOW, 0))) {
w->HandleButtonClick(TBN_ZOOMIN); w->HandleButtonClick((_game_mode == GM_EDITOR) ? TBSE_ZOOMIN : TBN_ZOOMIN);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
} }
} }
@ -530,7 +530,7 @@ static void ToolbarZoomInClick(Window *w)
static void ToolbarZoomOutClick(Window *w) static void ToolbarZoomOutClick(Window *w)
{ {
if (DoZoomInOutWindow(ZOOM_OUT, FindWindowById(WC_MAIN_WINDOW, 0))) { if (DoZoomInOutWindow(ZOOM_OUT, FindWindowById(WC_MAIN_WINDOW, 0))) {
w->HandleButtonClick(TBN_ZOOMOUT); w->HandleButtonClick((_game_mode == GM_EDITOR) ? TBSE_ZOOMOUT : TBN_ZOOMOUT);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
} }
} }
@ -704,22 +704,6 @@ static void ToolbarScenDateForward(Window *w)
_left_button_clicked = false; _left_button_clicked = false;
} }
static void ToolbarScenZoomIn(Window *w)
{
if (DoZoomInOutWindow(ZOOM_IN, FindWindowById(WC_MAIN_WINDOW, 0))) {
w->HandleButtonClick(TBSE_ZOOMIN);
SndPlayFx(SND_15_BEEP);
}
}
static void ToolbarScenZoomOut(Window *w)
{
if (DoZoomInOutWindow(ZOOM_OUT, FindWindowById(WC_MAIN_WINDOW, 0))) {
w->HandleButtonClick(TBSE_ZOOMOUT);
SndPlayFx(SND_15_BEEP);
}
}
static void ToolbarScenGenLand(Window *w) static void ToolbarScenGenLand(Window *w)
{ {
w->HandleButtonClick(TBSE_LANDGENERATE); w->HandleButtonClick(TBSE_LANDGENERATE);
@ -1080,8 +1064,8 @@ static ToolbarButtonProc * const _scen_toolbar_button_procs[] = {
ToolbarScenDateBackward, ToolbarScenDateBackward,
ToolbarScenDateForward, ToolbarScenDateForward,
ToolbarScenMapTownDir, ToolbarScenMapTownDir,
ToolbarScenZoomIn, ToolbarZoomInClick,
ToolbarScenZoomOut, ToolbarZoomOutClick,
ToolbarScenGenLand, ToolbarScenGenLand,
ToolbarScenGenTown, ToolbarScenGenTown,
ToolbarScenGenIndustry, ToolbarScenGenIndustry,
@ -1161,13 +1145,13 @@ public:
case WKC_NUM_PLUS: case WKC_NUM_PLUS:
case WKC_EQUALS: case WKC_EQUALS:
case WKC_SHIFT | WKC_EQUALS: case WKC_SHIFT | WKC_EQUALS:
case WKC_SHIFT | WKC_F5: ToolbarScenZoomIn(this); break; case WKC_SHIFT | WKC_F5: ToolbarZoomInClick(this); break;
/* those following are all fall through */ /* those following are all fall through */
case WKC_NUM_MINUS: case WKC_NUM_MINUS:
case WKC_MINUS: case WKC_MINUS:
case WKC_SHIFT | WKC_MINUS: case WKC_SHIFT | WKC_MINUS:
case WKC_SHIFT | WKC_F6: ToolbarScenZoomOut(this); break; case WKC_SHIFT | WKC_F6: ToolbarZoomOutClick(this); break;
case 'L': ShowEditorTerraformToolbar(); break; case 'L': ShowEditorTerraformToolbar(); break;
case 'M': ShowSmallMap(); break; case 'M': ShowSmallMap(); break;