From 6c76a89c2083f2e3a3ae03fc82fced3dea517387 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Tue, 31 Oct 2006 21:46:21 +0000 Subject: [PATCH] (svn r7023) -Fix: Pressing F1 in scenario editor did not work because the keypress event was sent twice. due to e->we.keypress.cont not being set to false. Also indent the switch statements for some coding style bonus points. --- main_gui.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/main_gui.c b/main_gui.c index bfaed7ad15..f7bf3d1d9a 100644 --- a/main_gui.c +++ b/main_gui.c @@ -2034,21 +2034,23 @@ static void ScenEditToolbarWndProc(Window *w, WindowEvent *e) case WE_KEYPRESS: switch (e->we.keypress.keycode) { - case WKC_F1: ToolbarPauseClick(w); break; - case WKC_F2: ShowGameOptions(); break; - case WKC_F3: MenuClickSaveLoad(0); break; - case WKC_F4: ToolbarScenGenLand(w); break; - case WKC_F5: ToolbarScenGenTown(w); break; - case WKC_F6: ToolbarScenGenIndustry(w); break; - case WKC_F7: ToolbarScenBuildRoad(w); break; - case WKC_F8: ToolbarScenPlantTrees(w); break; - case WKC_F9: ToolbarScenPlaceSign(w); break; - case WKC_F10: ShowMusicWindow(); break; - case WKC_F11: PlaceLandBlockInfo(); break; - case WKC_CTRL | 'S': MenuClickSmallScreenshot(); break; - case WKC_CTRL | 'G': MenuClickWorldScreenshot(); break; - case 'L': ShowEditorTerraformToolBar(); break; + case WKC_F1: ToolbarPauseClick(w); break; + case WKC_F2: ShowGameOptions(); break; + case WKC_F3: MenuClickSaveLoad(0); break; + case WKC_F4: ToolbarScenGenLand(w); break; + case WKC_F5: ToolbarScenGenTown(w); break; + case WKC_F6: ToolbarScenGenIndustry(w); break; + case WKC_F7: ToolbarScenBuildRoad(w); break; + case WKC_F8: ToolbarScenPlantTrees(w); break; + case WKC_F9: ToolbarScenPlaceSign(w); break; + case WKC_F10: ShowMusicWindow(); break; + case WKC_F11: PlaceLandBlockInfo(); break; + case WKC_CTRL | 'S': MenuClickSmallScreenshot(); break; + case WKC_CTRL | 'G': MenuClickWorldScreenshot(); break; + case 'L': ShowEditorTerraformToolBar(); break; + default: return; } + e->we.keypress.cont = false; break; case WE_PLACE_OBJ: {