diff options
| author | Darkvater <darkvater@openttd.org> | 2005-04-03 10:21:37 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2005-04-03 10:21:37 +0000 |
| commit | 83d62b1aa2495c4ae9da2abae4b6b5a4dd8c18cf (patch) | |
| tree | 08ce50899e34e0d3ae83f5846e87d4ab0e765a5c | |
| parent | 587106a8692dec18a179c769aa114313645a7f77 (diff) | |
| download | openttd-83d62b1aa2495c4ae9da2abae4b6b5a4dd8c18cf.tar.xz | |
(svn r2140) - Fix: [ 1175726 ] Allows rails in scenario editor. Moved both 'A' autorail and 'L' Terraform toolbar to their REAL places instead of the global window.
| -rw-r--r-- | main_gui.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/main_gui.c b/main_gui.c index 56d89e222..4b2580f54 100644 --- a/main_gui.c +++ b/main_gui.c @@ -1908,6 +1908,8 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e) case WKC_CTRL | 'S': _make_screenshot = 1; break; case WKC_CTRL | 'G': _make_screenshot = 2; break; case WKC_CTRL | WKC_ALT | 'C': if (!_networking) ShowCheatWindow(); break; + case 'A': ShowBuildRailToolbar(_last_built_railtype, 4); break; /* Invoke Autorail */ + case 'L': ShowTerraformToolbar(); break; default: return; e->keypress.cont = false; } @@ -2100,7 +2102,7 @@ static void ScenEditToolbarWndProc(Window *w, WindowEvent *e) } break; case WE_KEYPRESS: { - switch(e->keypress.keycode) { + switch (e->keypress.keycode) { case WKC_F1: ToolbarPauseClick(w); break; case WKC_F2: ShowGameOptions(); break; case WKC_F3: MenuClickSaveLoad(0); break; @@ -2114,9 +2116,9 @@ static void ScenEditToolbarWndProc(Window *w, WindowEvent *e) case WKC_F11: PlaceLandBlockInfo(); break; case WKC_CTRL | 'S': _make_screenshot = 1; break; case WKC_CTRL | 'G': _make_screenshot = 2; break; - } - break; - } + case 'L': ShowEditorTerraformToolBar(); break; + } break; + } break; case WE_PLACE_OBJ: { _place_proc(e->place.tile); @@ -2350,18 +2352,6 @@ static void MainWindowWndProc(Window *w, WindowEvent *e) { #endif break; - // invoke autorail - case 'A': - ShowBuildRailToolbar(_last_built_railtype, 4); - break; - - case 'L': - if (_game_mode == GM_EDITOR) { - ShowEditorTerraformToolBar(); - } else - ShowTerraformToolbar(); - break; - case 'X': _display_opt ^= DO_TRANS_BUILDINGS; MarkWholeScreenDirty(); @@ -2370,7 +2360,7 @@ static void MainWindowWndProc(Window *w, WindowEvent *e) { #ifdef ENABLE_NETWORK case WKC_RETURN: case 'T' | WKC_SHIFT: - if(_networking) + if (_networking) ShowNetworkChatQueryWindow(DESTTYPE_BROADCAST, 0); break; #endif /* ENABLE_NETWORK */ |