summaryrefslogtreecommitdiff
path: root/main_gui.c
diff options
context:
space:
mode:
authordominik <dominik@openttd.org>2004-12-12 22:05:08 +0000
committerdominik <dominik@openttd.org>2004-12-12 22:05:08 +0000
commitc466fcb3b2a8b9882618eb217c24fd2acdbbeca8 (patch)
treef7395153246eca640ab2e307bfa65b502eff689a /main_gui.c
parenta346f7cb54f6540100e35c2101b3eb0ba0188f2e (diff)
downloadopenttd-c466fcb3b2a8b9882618eb217c24fd2acdbbeca8.tar.xz
(svn r1040) Fix: All character hotkeys are disabled now when a window for typing is open
Diffstat (limited to 'main_gui.c')
-rw-r--r--main_gui.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/main_gui.c b/main_gui.c
index 23d3ef55a..011733e53 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -1809,7 +1809,6 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
case WKC_PAUSE:
ToolbarPauseClick(w);
break;
- case 'L': ShowTerraformToolbar(); break;
case WKC_F2: ShowGameOptions(); break;
case WKC_F3: MenuClickSaveLoad(0); break;
case WKC_F4: ShowSmallMap(); break;
@@ -1835,7 +1834,6 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
case WKC_SHIFT | WKC_F12: ShowMusicWindow(); break;
case WKC_CTRL | 'S': _make_screenshot = 1; break;
case WKC_CTRL | 'G': _make_screenshot = 2; break;
- case WKC_BACKQUOTE: IConsoleSwitch(); e->keypress.cont=false; break;
case WKC_CTRL | WKC_ALT | 'C': if (!_networking) ShowCheatWindow(); break;
}
} break;
@@ -2324,11 +2322,20 @@ static void MainWindowWndProc(Window *w, WindowEvent *e) {
ShowBuildRailToolbar(_last_built_railtype, 0);
break;
+ case 'L':
+ ShowTerraformToolbar();
+ break;
+
case 'X':
_display_opt ^= DO_TRANS_BUILDINGS;
MarkWholeScreenDirty();
break;
+ case WKC_BACKQUOTE:
+ IConsoleSwitch();
+ e->keypress.cont=false;
+ break;
+
#ifdef ENABLE_NETWORK
case 'T' | WKC_SHIFT:
ShowNetworkChatQueryWindow(DESTTYPE_BROADCAST, 0);