From ed0a42f940db567088d39b583f0b66ed274ee20d Mon Sep 17 00:00:00 2001 From: darkvater Date: Wed, 22 Dec 2004 17:37:21 +0000 Subject: (svn r1225) -Feature: SHIFT+DEL now deletes all non-vital windows (only status bar and main bar remain) -Fix: For everyone who tried to crash the game by opening a huge amount of windows and stickying all of them; bad luck. It's fixed now (thanks Tron for the helpful criticism). First all normal windows are a candidate for replacement, then if none are found, sticky windows. Then..well that should not happen :) --- main_gui.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'main_gui.c') diff --git a/main_gui.c b/main_gui.c index 93577dbc5..b6442a181 100644 --- a/main_gui.c +++ b/main_gui.c @@ -152,26 +152,6 @@ static void ToolbarFastForwardClick(Window *w) SndPlayFx(SND_15_BEEP); } -/* It is possible that a stickied window gets to a position where the - * 'close' button is outside the gaming area. You cannot close it then; except - * with this function. It closes all windows calling the standard function, - * then, does a little hacked loop of closing all stickied windows. Note - * that standard windows (status bar, etc.) are not stickied, so these aren't affected */ -static void CloseEveryWindow(void) -{ - Window *w; - // Delete every window except for stickied ones - DeleteNonVitalWindows(); - // Delete all sticked windows - for (w = _windows; w != _last_window;) { - if (w->flags4 & WF_STICKY) { - DeleteWindow(w); - w = _windows; - } else - w++; - } -} - typedef void MenuClickedProc(int index); @@ -183,7 +163,7 @@ static void MenuClickSettings(int index) case 2: ShowPatchesSelection(); return; case 3: ShowNewgrf(); return; - case 5: CloseEveryWindow(); return; + case 5: DeleteAllNonVitalWindows(); return; case 6: _display_opt ^= DO_SHOW_TOWN_NAMES; MarkWholeScreenDirty(); return; case 7: _display_opt ^= DO_SHOW_STATION_NAMES; MarkWholeScreenDirty(); return; case 8: _display_opt ^= DO_SHOW_SIGNS; MarkWholeScreenDirty(); return; @@ -2330,6 +2310,7 @@ static void MainWindowWndProc(Window *w, WindowEvent *e) { case WKC_ESC: ResetObjectToPlace(); break; case WKC_DELETE: DeleteNonVitalWindows(); break; + case WKC_DELETE | WKC_SHIFT: DeleteAllNonVitalWindows(); break; case 'Q' | WKC_CTRL: AskExitGame(); break; case 'Q' | WKC_META: AskExitGame(); break; // this enables command + Q on mac case 'R' | WKC_CTRL: MarkWholeScreenDirty(); break; -- cgit v1.2.3-54-g00ecf