diff options
| author | Tony J. White <tjw@tjw.org> | 2007-05-22 04:31:03 +0000 |
|---|---|---|
| committer | Tony J. White <tjw@tjw.org> | 2007-05-22 04:31:03 +0000 |
| commit | a4d89d66fb756d037c55fda1b772b05d4b6f0484 (patch) | |
| tree | 26063a4687926c98d0b5cfe11b10d825deb3f706 /src | |
| parent | a75a973733f62c9f1fe6f1c1787762db78973771 (diff) | |
* (bug 3093) if g_privateMessages is disabled, continue to parse
/m and /mt out of say messages but print a warning
to the client instead of blurting it out as a not-so-private
message. (Chris Schwarz)
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_cmds.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index fe56d2ed..dbbfc517 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -982,17 +982,14 @@ static void Cmd_Say_f( gentity_t *ent, int mode, qboolean arg0 ) // support parsing /m out of say text since some people have a hard // time figuring out what the console is. - if( g_privateMessages.integer ) - { - args = G_SayConcatArgs(0); - if( !Q_stricmpn( args, "say /m ", 7 ) || + args = G_SayConcatArgs(0); + if( !Q_stricmpn( args, "say /m ", 7 ) || !Q_stricmpn( args, "say_team /m ", 12 ) || !Q_stricmpn( args, "say /mt ", 8 ) || !Q_stricmpn( args, "say_team /mt ", 13 ) ) - { - G_PrivateMessage( ent ); - return; - } + { + G_PrivateMessage( ent ); + return; } if( trap_Argc( ) < 2 && !arg0 ) @@ -3186,7 +3183,10 @@ void G_PrivateMessage( gentity_t *ent ) gentity_t *tmpent; if( !g_privateMessages.integer && ent ) + { + ADMP( "Sorry, but private messages have been disabled\n" ); return; + } G_SayArgv( 0, cmd, sizeof( cmd ) ); if( !Q_stricmp( cmd, "say" ) || !Q_stricmp( cmd, "say_team" ) ) |