summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cgame/cg_consolecmds.c34
-rw-r--r--src/game/g_cmds.c47
-rw-r--r--src/qcommon/q_shared.h1
-rw-r--r--src/ui/ui_atoms.c2
-rw-r--r--src/ui/ui_local.h1
-rw-r--r--src/ui/ui_main.c4
6 files changed, 1 insertions, 88 deletions
diff --git a/src/cgame/cg_consolecmds.c b/src/cgame/cg_consolecmds.c
index 4b408cf1..524d3412 100644
--- a/src/cgame/cg_consolecmds.c
+++ b/src/cgame/cg_consolecmds.c
@@ -143,36 +143,6 @@ static void CG_ScoresUp_f( void )
}
}
-static void CG_TellTarget_f( void )
-{
- int clientNum;
- char command[ 128 ];
- char message[ 128 ];
-
- clientNum = CG_CrosshairPlayer( );
- if( clientNum == -1 )
- return;
-
- trap_Args( message, 128 );
- Com_sprintf( command, 128, "tell %i %s", clientNum, message );
- trap_SendClientCommand( command );
-}
-
-static void CG_TellAttacker_f( void )
-{
- int clientNum;
- char command[ 128 ];
- char message[ 128 ];
-
- clientNum = CG_LastAttacker( );
- if( clientNum == -1 )
- return;
-
- trap_Args( message, 128 );
- Com_sprintf( command, 128, "tell %i %s", clientNum, message );
- trap_SendClientCommand( command );
-}
-
void CG_ClientList_f( void )
{
clientInfo_t *ci;
@@ -232,8 +202,6 @@ static consoleCommand_t commands[ ] =
{ "weapnext", CG_NextWeapon_f },
{ "weapprev", CG_PrevWeapon_f },
{ "weapon", CG_Weapon_f },
- { "tell_target", CG_TellTarget_f },
- { "tell_attacker", CG_TellAttacker_f },
{ "testPS", CG_TestPS_f },
{ "destroyTestPS", CG_DestroyTestPS_f },
{ "testTS", CG_TestTS_f },
@@ -301,7 +269,6 @@ void CG_InitConsoleCommands( void )
trap_AddCommand( "vsay_local" );
trap_AddCommand( "m" );
trap_AddCommand( "mt" );
- trap_AddCommand( "tell" );
trap_AddCommand( "give" );
trap_AddCommand( "god" );
trap_AddCommand( "notarget" );
@@ -319,7 +286,6 @@ void CG_InitConsoleCommands( void )
trap_AddCommand( "buy" );
trap_AddCommand( "sell" );
trap_AddCommand( "reload" );
- trap_AddCommand( "boost" );
trap_AddCommand( "itemact" );
trap_AddCommand( "itemdeact" );
trap_AddCommand( "itemtoggle" );
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 2a5b5e7a..4cbfa35b 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -757,17 +757,6 @@ void G_Say( gentity_t *ent, gentity_t *target, int mode, const char *chatText )
ent->client->pers.netname );
color = COLOR_CYAN;
break;
-
- case SAY_TELL:
- if( target && OnSameTeam( target, ent ) &&
- Team_GetLocationMsg( ent, location, sizeof( location ) ) )
- Com_sprintf( name, sizeof( name ), "[%s" S_COLOR_WHITE "] (%s): ",
- ( ent ) ? ent->client->pers.netname : "console", location );
- else
- Com_sprintf( name, sizeof( name ), "[%s" S_COLOR_WHITE "]: ",
- ( ent ) ? ent->client->pers.netname : "console" );
- color = COLOR_MAGENTA;
- break;
}
Q_strncpyz( text, chatText, sizeof( text ) );
@@ -880,41 +869,6 @@ static void Cmd_Say_f( gentity_t *ent )
/*
==================
-Cmd_Tell_f
-==================
-*/
-static void Cmd_Tell_f( gentity_t *ent )
-{
- int targetNum;
- gentity_t *target;
- char *p;
- char arg[MAX_TOKEN_CHARS];
-
- if( trap_Argc( ) < 2 )
- return;
-
- trap_Argv( 1, arg, sizeof( arg ) );
- targetNum = atoi( arg );
-
- if( targetNum < 0 || targetNum >= level.maxclients )
- return;
-
- target = &g_entities[ targetNum ];
- if( !target || !target->inuse || !target->client )
- return;
-
- p = ConcatArgs( 2 );
-
- G_LogPrintf( "tell: %s^7 to %s^7: %s\n", ent->client->pers.netname, target->client->pers.netname, p );
- G_Say( ent, target, SAY_TELL, p );
- // don't tell to the player self if it was already directed to this player
- // also don't send the chat back to a bot
- if( ent != target )
- G_Say( ent, ent, SAY_TELL, p );
-}
-
-/*
-==================
Cmd_VSay_f
==================
*/
@@ -3156,7 +3110,6 @@ commands_t cmds[ ] = {
{ "unignore", 0, Cmd_Ignore_f },
// communication commands
- { "tell", CMD_MESSAGE, Cmd_Tell_f },
{ "callvote", CMD_MESSAGE, Cmd_CallVote_f },
{ "callteamvote", CMD_MESSAGE|CMD_TEAM, Cmd_CallTeamVote_f },
{ "say_area", CMD_MESSAGE|CMD_TEAM, Cmd_SayArea_f },
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index a346bf5e..64acc8d0 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -1366,7 +1366,6 @@ typedef enum {
#define SAY_ALL 0
#define SAY_TEAM 1
-#define SAY_TELL 2
#define MAX_EMOTICON_NAME_LEN 16
#define MAX_EMOTICONS 64
diff --git a/src/ui/ui_atoms.c b/src/ui/ui_atoms.c
index c78df7ff..9f0f3a9a 100644
--- a/src/ui/ui_atoms.c
+++ b/src/ui/ui_atoms.c
@@ -135,13 +135,11 @@ static void UI_MessageMode_f( void )
case '\0':
// Global
uiInfo.chatTeam = qfalse;
- uiInfo.chatTargetClientNum = -1;
break;
case '2':
// Team
uiInfo.chatTeam = qtrue;
- uiInfo.chatTargetClientNum = -1;
break;
}
diff --git a/src/ui/ui_local.h b/src/ui/ui_local.h
index 938f1e23..241cb6d8 100644
--- a/src/ui/ui_local.h
+++ b/src/ui/ui_local.h
@@ -282,7 +282,6 @@ typedef struct
qboolean inGameLoad;
qboolean chatTeam;
- int chatTargetClientNum;
}
uiInfo_t;
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 07883fc8..c63dae79 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -2995,9 +2995,7 @@ static void UI_RunMenuScript( char **args )
if( buffer[ 0 ] )
{
- if( uiInfo.chatTargetClientNum != -1 )
- trap_Cmd_ExecuteText( EXEC_APPEND, va( "tell %i \"%s\"\n", uiInfo.chatTargetClientNum, buffer ) );
- else if( uiInfo.chatTeam )
+ if( uiInfo.chatTeam )
trap_Cmd_ExecuteText( EXEC_APPEND, va( "say_team \"%s\"\n", buffer ) );
else
trap_Cmd_ExecuteText( EXEC_APPEND, va( "say \"%s\"\n", buffer ) );
generated by cgit (git 2.34.1) at 2024-11-15 20:42:22 +0000