From dd0dd03f6f94a15b8764973e4c893526d8cfd722 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Tue, 2 Oct 2007 21:29:25 +0000 Subject: * Merge of ioq3-r1189 + Fix bug that prevented key up events getting to cgame/ui when not in game + Use Key_[GS]etCatcher everywhere to set keycatcher + Clear all key states when the catcher changes * Slim down client userinfo somewhat * Remove some redundant client autocomplete commands * Actually make use of "menuStack" in the UI module + No longer close all menus when exiting one, instead reverting to the next one on the stack + Cleanup the menu activation functions a little * Truncate text in list columns if it exceeds the column width * Remove maxChars field from columns member of ITEM_TYPE_LISTBOX * Revert r992 due to more general and less buggy/hacky fix from ioq3 --- ui/quit.menu | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'ui/quit.menu') diff --git a/ui/quit.menu b/ui/quit.menu index 0f953a06..6926b93e 100644 --- a/ui/quit.menu +++ b/ui/quit.menu @@ -16,8 +16,7 @@ onESC { play "sound/misc/menu1.wav"; - close quit_popmenu; - open main + close quit_popmenu } @@ -70,8 +69,6 @@ action { play "sound/misc/menu4.wav"; - close main; - close quit_popmenu; open quitCredit } } @@ -92,8 +89,7 @@ action { play "sound/misc/menu1.wav"; - close quit_popmenu; - open main + close quit_popmenu } } } -- cgit