diff options
| author | Tim Angus <tim@ngus.net> | 2007-10-02 21:29:25 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-10-02 21:29:25 +0000 |
| commit | dd0dd03f6f94a15b8764973e4c893526d8cfd722 (patch) | |
| tree | 4a3989e08a16d58e6b4f9fda7380e20ba05b8a28 /src/ui/ui_main.c | |
| parent | e6513f95705560250f00f1ccc0707e01e318192f (diff) | |
* 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
Diffstat (limited to 'src/ui/ui_main.c')
| -rw-r--r-- | src/ui/ui_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 0af801a0..768008f6 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -1612,7 +1612,7 @@ static const char *UI_AIFromName(const char *name) { return uiInfo.aliasList[j].ai; } } - return "James"; + return ""; } static qboolean updateOpponentModel = qtrue; @@ -3926,7 +3926,7 @@ static void UI_RunMenuScript(char **args) { UI_BuildServerDisplayList(qtrue); } else { Menus_CloseByName("joinserver"); - Menus_OpenByName("main"); + Menus_ActivateByName("main"); } } else if (Q_stricmp(name, "StopRefresh") == 0) { UI_StopServerRefresh(); @@ -6092,7 +6092,7 @@ static cvarTable_t cvarTable[] = { { &ui_captureLimit, "ui_captureLimit", "5", 0}, { &ui_smallFont, "ui_smallFont", "0.2", CVAR_ARCHIVE}, { &ui_bigFont, "ui_bigFont", "0.5", CVAR_ARCHIVE}, - { &ui_findPlayer, "ui_findPlayer", "Sarge", CVAR_ARCHIVE}, + { &ui_findPlayer, "ui_findPlayer", "", CVAR_ARCHIVE}, { &ui_Q3Model, "ui_q3model", "0", CVAR_ARCHIVE}, { &ui_hudFiles, "cg_hudFiles", "ui/hud.txt", CVAR_ARCHIVE}, { &ui_recordSPDemo, "ui_recordSPDemo", "0", CVAR_ARCHIVE}, |