summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorMichael Levin <risujin@fastmail.fm>2009-10-03 11:18:41 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:14:52 +0000
commit9dd501f6338a95183ad4a245c2b813699b3a6513 (patch)
tree04c90a6abb944f960f809613160f481bc99d5a3d /src/ui
parentd1747093e36873d29801ff6c6ecf5d24db94be62 (diff)
* Oops, Repeater now gives Repeater reward credits
* Reloading a weapon and switching to blaster will not cause it to be "reloaded" * Removed "team change free" flag, all clients keep credits when changing teams * Human and Alien credits properly converted when switching teams (based on max) * Cannot open both say prompts at the same time anymore
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/ui_atoms.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ui/ui_atoms.c b/src/ui/ui_atoms.c
index bb12a972..65cfd0b1 100644
--- a/src/ui/ui_atoms.c
+++ b/src/ui/ui_atoms.c
@@ -166,6 +166,8 @@ qboolean UI_ConsoleCommand( int realTime )
uiInfo.chatTeam = qfalse;
trap_Key_SetCatcher( KEYCATCH_UI );
+ Menus_CloseByName( "say" );
+ Menus_CloseByName( "say_team" );
Menus_ActivateByName( "say" );
return qtrue;
}
@@ -177,6 +179,8 @@ qboolean UI_ConsoleCommand( int realTime )
uiInfo.chatTeam = qtrue;
trap_Key_SetCatcher( KEYCATCH_UI );
+ Menus_CloseByName( "say" );
+ Menus_CloseByName( "say_team" );
Menus_ActivateByName( "say_team" );
return qtrue;
}