From 6f56815bdb0ba0b37d4afcd4c2cac3f4ddd1846d Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sat, 3 Oct 2009 12:26:21 +0000 Subject: * Don't display team join message if previous clientinfo was invalid (bug 3960) * Move CG_TeamJoinMessage to cg_players.c near where it is used * When changing team, execute cg_(alien|human|spectator)Config as appropriate --- src/cgame/cg_event.c | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'src/cgame/cg_event.c') diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index 7bc50929..2ec45f39 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -368,49 +368,6 @@ static void CG_Obituary( entityState_t *ent ) } -/* -============= -CG_TeamJoinMessage - -Prints messages when players change teams -============= -*/ -void CG_TeamJoinMessage( clientInfo_t *newInfo, clientInfo_t *ci ) -{ - int team; - int oldteam; - char *playerName; - - - // Collect info - team = newInfo->team; - oldteam = ci->team; - - playerName = newInfo->name; - - // If no change occurred, print nothing - if( team == oldteam ) - return; - - // Print the appropriate message - if( team == TEAM_NONE ) - { - CG_Printf( "%s" S_COLOR_WHITE " left the %ss\n", - playerName, BG_TeamName( oldteam ) ); - } - else if( oldteam == TEAM_NONE ) - { - CG_Printf( "%s" S_COLOR_WHITE " joined the %ss\n", - playerName, BG_TeamName( team ) ); - } - else - { - CG_Printf( "%s" S_COLOR_WHITE " left the %ss and joined the %ss\n", - playerName, BG_TeamName( oldteam ), BG_TeamName( team ) ); - } -} - - //========================================================================== -- cgit