diff options
| -rw-r--r-- | src/ui/ui_atoms.c | 28 | ||||
| -rw-r--r-- | ui/say.menu | 44 |
2 files changed, 54 insertions, 18 deletions
diff --git a/src/ui/ui_atoms.c b/src/ui/ui_atoms.c index ab35533c..bb12a972 100644 --- a/src/ui/ui_atoms.c +++ b/src/ui/ui_atoms.c @@ -160,28 +160,24 @@ qboolean UI_ConsoleCommand( int realTime ) return qtrue; } - if( Q_strncmp( cmd, "ui_messagemode", 14 ) == 0 ) + if( Q_stricmp( cmd, "ui_messagemode" ) == 0 ) { trap_Cvar_Set( "ui_sayBuffer", "" ); + uiInfo.chatTeam = qfalse; - switch( cmd[ 14 ] ) - { - default: - case '\0': - // Global - uiInfo.chatTeam = qfalse; - uiInfo.chatTargetClientNum = -1; - break; + trap_Key_SetCatcher( KEYCATCH_UI ); + Menus_ActivateByName( "say" ); + return qtrue; + } - case '2': - // Team - uiInfo.chatTeam = qtrue; - uiInfo.chatTargetClientNum = -1; - break; - } + if( Q_stricmp( cmd, "ui_messagemode2" ) == 0 ) + { + trap_Cvar_Set( "ui_sayBuffer", "" ); + uiInfo.chatTargetClientNum = -1; + uiInfo.chatTeam = qtrue; trap_Key_SetCatcher( KEYCATCH_UI ); - Menus_ActivateByName( "say" ); + Menus_ActivateByName( "say_team" ); return qtrue; } diff --git a/ui/say.menu b/ui/say.menu index 1991eef2..51b7e681 100644 --- a/ui/say.menu +++ b/ui/say.menu @@ -9,6 +9,7 @@ #define W (600-(2*BORDER)) #define H 40 + // Say to All menuDef { name say @@ -21,7 +22,7 @@ style WINDOW_STYLE_EMPTY onOpen { - setfocus say_field + setfocus say_field; } itemDef @@ -42,7 +43,46 @@ onTextEntry { uiScript Say; - close say + close say; + } + } + } + + // Say to Team + menuDef + { + name say_team + fullScreen MENU_FALSE + visible MENU_FALSE + dontCloseAll MENU_TRUE + rect X Y W H + aspectBias ALIGN_LEFT + focusColor 1 1 1 1 + style WINDOW_STYLE_EMPTY + onOpen + { + setfocus say_field + } + + itemDef + { + name say_field + type ITEM_TYPE_EDITFIELD + style WINDOW_STYLE_EMPTY + text "Say to team:" + cvar "ui_sayBuffer" + maxchars 128 + rect 0 0 W H + textalign ALIGN_LEFT + textvalign VALIGN_CENTER + textstyle ITEM_TEXTSTYLE_SHADOWED + textscale .4 + forecolor 0.93 0.93 0.92 1 + visible MENU_TRUE + onTextEntry + { + uiScript Say; + close say_team; } } } |