dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/toolbar_gui.cpp
This commit is contained in:
Jonathan G Rennison
2020-04-12 11:25:34 +01:00
parent 0a61671ff1 9339e4dcad
commit a4bf068c6c
5 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/toolbar_gui.cpp
View File

@@ -2047,6 +2047,7 @@ enum MainToolbarHotkeys {
MTHK_BUILD_AIRPORT,
MTHK_BUILD_TREES,
MTHK_MUSIC,
MTHK_LANDINFO,
MTHK_AI_DEBUG,
MTHK_SMALL_SCREENSHOT,
MTHK_ZOOMEDIN_SCREENSHOT,
@@ -2117,6 +2118,7 @@ struct MainToolbarWindow : Window {
EventState OnHotkey(int hotkey) override
{
CallBackFunction cbf = CBF_NONE;
switch (hotkey) {
case MTHK_PAUSE: ToolbarPauseClick(this); break;
case MTHK_FASTFORWARD: ToolbarFastForwardClick(this); break;
@@ -2157,9 +2159,11 @@ struct MainToolbarWindow : Window {
case MTHK_EXTRA_VIEWPORT: ShowExtraViewPortWindowForTileUnderCursor(); break;
case MTHK_CLIENT_LIST: if (_networking) ShowClientList(); break;
case MTHK_SIGN_LIST: ShowSignList(); break;
case MTHK_LANDINFO: cbf = PlaceLandBlockInfo(); break;
case MTHK_PLAN_LIST: ShowPlansWindow(); break;
default: return ES_NOT_HANDLED;
}
if (cbf != CBF_NONE) _last_started_action = cbf;
return ES_HANDLED;
}
@@ -2270,6 +2274,7 @@ static Hotkey maintoolbar_hotkeys[] = {
Hotkey('V', "extra_viewport", MTHK_EXTRA_VIEWPORT),
Hotkey((uint16)0, "client_list", MTHK_CLIENT_LIST),
Hotkey((uint16)0, "sign_list", MTHK_SIGN_LIST),
Hotkey((uint16)0, "land_info", MTHK_LANDINFO),
Hotkey('P', "plan_list", MTHK_PLAN_LIST),
HOTKEY_LIST_END
};