diff options
| author | Michael Levin <risujin@fastmail.fm> | 2009-10-03 11:26:03 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:14:59 +0000 |
| commit | 617fac98d0df82c4beda446547ca021b7a12d9dd (patch) | |
| tree | ddea2c0785b61aec075c9fcb3d20a29045fb4af5 /src/ui | |
| parent | c2772cce6c591f4b043da4526764298d88cce9a9 (diff) | |
* Build delay pie slices are now 5 sec each for both teams
* Removed individual weapon build delay
* Removed Advanced Construction Kit, everything is built by the normal kit
* S2+ buildables cannot be built by regular grangers
* Clicking to pick team during spectator mode fixed
* New cvar: cg_printDuplicate, when set to 0 (default) prevents duplicate messages from being printed to screen (they still show up in console)
* Pressing ESC while editing a UI item (esp. new Say menu) will not cause your cursor to disappear next time you open a menu
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/ui_main.c | 6 | ||||
| -rw-r--r-- | src/ui/ui_shared.c | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 3a7e6d7e..fcc3799d 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -2224,11 +2224,7 @@ static void UI_LoadHumanItems( void ) if( BG_WeaponIsAllowed( WP_MACHINEGUN ) ) UI_AddItem( WP_MACHINEGUN ); - - if( BG_WeaponIsAllowed( WP_HBUILD2 ) && - BG_FindStagesForWeapon( WP_HBUILD2, UI_GetCurrentHumanStage( ) ) ) - UI_AddItem( WP_HBUILD2 ); - else if( BG_WeaponIsAllowed( WP_HBUILD ) ) + if( BG_WeaponIsAllowed( WP_HBUILD ) ) UI_AddItem( WP_HBUILD ); } diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c index f0dce0bc..2b06329a 100644 --- a/src/ui/ui_shared.c +++ b/src/ui/ui_shared.c @@ -1566,7 +1566,12 @@ void Menus_CloseAll( qboolean force ) } if( force ) + { openMenuCount = 0; + g_editingField = qfalse; + g_waitingForKey = qfalse; + g_editItem = NULL; + } } @@ -4075,9 +4080,6 @@ void Menu_HandleKey( menuDef_t *menu, int key, qboolean down ) itemDef_t *item = NULL; qboolean inHandler = qfalse; - if( inHandler ) - return; - inHandler = qtrue; if( g_waitingForKey && down ) |