summaryrefslogtreecommitdiff
path: root/src/hotkeys.cpp
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2010-07-03 19:35:54 +0000
committeryexo <yexo@openttd.org>2010-07-03 19:35:54 +0000
commitddf11b7d3f1671a251b859d0ead13cdbe117fbc7 (patch)
tree5c2180403e1cdd809ed6aa7a807036f39629326e /src/hotkeys.cpp
parented4fdd4a7b867c2e97b98fedbed4fd4c608d0cfc (diff)
downloadopenttd-ddf11b7d3f1671a251b859d0ead13cdbe117fbc7.tar.xz
(svn r20065) -Feature: customizable hotkeys for the main toolbar
Diffstat (limited to 'src/hotkeys.cpp')
-rw-r--r--src/hotkeys.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp
index dae73b5d2..baafb0940 100644
--- a/src/hotkeys.cpp
+++ b/src/hotkeys.cpp
@@ -49,6 +49,10 @@ static const KeycodeNames _keycode_to_name[] = {
{"PAUSE", WKC_PAUSE},
{"PLUS", (WindowKeyCodes)'+'},
{"COMMA", (WindowKeyCodes)','},
+ {"NUM_PLUS", WKC_NUM_PLUS},
+ {"NUM_PLUS", WKC_NUM_MINUS},
+ {"=", WKC_EQUALS},
+ {"-", WKC_MINUS},
};
/**
@@ -200,7 +204,7 @@ void LoadHotkeyGroup(IniGroup *group, T *hotkey_list)
IniItem *item = group->GetItem(hotkey->name, false);
if (item != NULL) {
hotkey->keycodes.Clear();
- ParseHotkeys(hotkey, item->value);
+ if (item->value != NULL) ParseHotkeys(hotkey, item->value);
}
}
}
@@ -233,6 +237,7 @@ struct ScenarioEditorLandscapeGenerationWindow;
struct OrdersWindow;
struct BuildAirToolbarWindow;
struct BuildDocksToolbarWindow;
+struct MainToolbarWindow;
static void SaveLoadHotkeys(bool save)
{
@@ -252,6 +257,7 @@ static void SaveLoadHotkeys(bool save)
SL_HOTKEYS(order, OrdersWindow);
SL_HOTKEYS(airtoolbar, BuildAirToolbarWindow);
SL_HOTKEYS(dockstoolbar, BuildDocksToolbarWindow);
+ SL_HOTKEYS(maintoolbar, MainToolbarWindow);
#undef SL_HOTKEYS