diff options
| author | yexo <yexo@openttd.org> | 2010-07-03 21:43:44 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2010-07-03 21:43:44 +0000 |
| commit | 26be68ae9823b7a078c8251f70038d98961388bc (patch) | |
| tree | dcd4778a53008b1805224ae3143dd7511adb3b20 /src/window.cpp | |
| parent | 9be9302cdbe5e23ad7565e7d76b9ac2414fb0796 (diff) | |
| download | openttd-26be68ae9823b7a078c8251f70038d98961388bc.tar.xz | |
(svn r20070) -Feature: when none of the open windows handles a keypress, try all toolbars for global hotkeys
Users that have run a version between r20056 and r20068 should delete their hotkeys.cfg to reset the terraform toolbar hotkeys to default
Diffstat (limited to 'src/window.cpp')
| -rw-r--r-- | src/window.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/window.cpp b/src/window.cpp index f15293ea3..2379f173b 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -32,6 +32,7 @@ #include "strings_func.h" #include "settings_type.h" #include "newgrf_debug.h" +#include "hotkeys.h" #include "table/sprites.h" @@ -1955,7 +1956,9 @@ void HandleKeypress(uint32 raw_key) w = FindWindowById(WC_MAIN_TOOLBAR, 0); /* When there is no toolbar w is null, check for that */ - if (w != NULL) w->OnKeyPress(key, keycode); + if (w != NULL && w->OnKeyPress(key, keycode) == ES_HANDLED) return; + + HandleGlobalHotkeys(key, keycode); } /** |