From 364c8966e3c7a266d5a1c0bd44d16d011ac90cce Mon Sep 17 00:00:00 2001 From: Richard Allen Date: Wed, 5 Jun 2002 23:53:05 +0000 Subject: [PATCH] Color fixes for player names --- reaction/cgame/cg_event.c | 7 +++++-- reaction/game/g_cmds.c | 9 ++++++--- reaction/game/g_matchmode.c | 14 +++++++------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/reaction/cgame/cg_event.c b/reaction/cgame/cg_event.c index 4a1402e5..7b11370c 100644 --- a/reaction/cgame/cg_event.c +++ b/reaction/cgame/cg_event.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.63 2002/06/05 23:53:05 jbravo +// Color fixes for player names +// // Revision 1.62 2002/06/05 09:42:30 niceass // removed old death messages // @@ -413,14 +416,14 @@ static void CG_JumpKick ( entityState_t *ent ) else Q_strncpyz(sex, "its", sizeof(sex)); - CG_Printf("You kicked %s's %s from %s hands!\n", + CG_Printf("You kicked %s^7's %s from %s hands!\n", ci->name, cg_weapons[ent->weapon].item->pickup_name, sex); } else if (ent->weapon && target == cg.clientNum) { // this client was the kicked ci = &cgs.clientinfo[attacker]; - CG_Printf("%s kicked your weapon from your hands!\n", ci->name); + CG_Printf("%s^7 kicked your weapon from your hands!\n", ci->name); } // everyone hears this diff --git a/reaction/game/g_cmds.c b/reaction/game/g_cmds.c index 99571dfa..4cfeb7db 100644 --- a/reaction/game/g_cmds.c +++ b/reaction/game/g_cmds.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.120 2002/06/05 23:53:05 jbravo +// Color fixes for player names +// // Revision 1.119 2002/06/05 04:57:50 niceass // "team" command fix // @@ -1797,7 +1800,7 @@ void Cmd_CallVote_f( gentity_t *ent ) { Com_sprintf( level.voteDisplayString, sizeof( level.voteDisplayString ), "%s", level.voteString ); } - trap_SendServerCommand( -1, va("print \"%s called a vote.\n\"", ent->client->pers.netname ) ); + trap_SendServerCommand( -1, va("print \"%s^7 called a vote.\n\"", ent->client->pers.netname ) ); // start the voting, the caller autoamtically votes yes level.voteTime = level.time; @@ -1962,7 +1965,7 @@ void Cmd_CallTeamVote_f( gentity_t *ent ) { if ( level.clients[i].pers.connected == CON_DISCONNECTED ) continue; if (level.clients[i].sess.sessionTeam == team) - trap_SendServerCommand( i, va("print \"%s called a team vote.\n\"", ent->client->pers.netname ) ); + trap_SendServerCommand( i, va("print \"%s^7 called a team vote.\n\"", ent->client->pers.netname ) ); } // start the voting, the caller autoamtically votes yes @@ -2792,7 +2795,7 @@ void Cmd_PlayerStats_f( gentity_t *ent ) { //char textbuf[1024]; - trap_SendServerCommand( ent-g_entities, va("print \"%s:\n\"",ent->client->pers.netname )); + trap_SendServerCommand( ent-g_entities, va("print \"%s^7:\n\"",ent->client->pers.netname )); trap_SendServerCommand( ent-g_entities, va("print \"----------------------------------\n\"")); trap_SendServerCommand( ent-g_entities, va("print \"| Weapon | Accuracy | Hits/Shots |\n\"")); trap_SendServerCommand( ent-g_entities, va("print \"----------------------------------\n\"")); diff --git a/reaction/game/g_matchmode.c b/reaction/game/g_matchmode.c index 23ac6410..84be99b2 100644 --- a/reaction/game/g_matchmode.c +++ b/reaction/game/g_matchmode.c @@ -60,12 +60,12 @@ void MM_Sub_f (gentity_t *ent) { player_die (ent, ent, ent, 100000, MOD_SUICIDE); } ent->client->sess.sub = ent->client->sess.savedTeam; - trap_SendServerCommand( -1, va("print \"%s is now a Substitute for %s.\n\"", + trap_SendServerCommand( -1, va("print \"%s^7 is now a Substitute for %s.\n\"", ent->client->pers.netname, ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string)); } else { ent->client->sess.sub = TEAM_FREE; - trap_SendServerCommand( -1, va("print \"%s is no longer a Substitute for %s.\n\"", + trap_SendServerCommand( -1, va("print \"%s^7 is no longer a Substitute for %s.\n\"", ent->client->pers.netname, ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string)); } @@ -80,18 +80,18 @@ void MM_Captain_f (gentity_t *ent) { } if (ent->client->sess.captain == TEAM_RED) { trap_Cvar_Set("g_RQ3_team1ready", "0"); - trap_SendServerCommand( -1, va("print \"%s is no longer %s's Captain.\n\"", + trap_SendServerCommand( -1, va("print \"%s^7 is no longer %s's Captain.\n\"", ent->client->pers.netname, g_RQ3_team1name.string)); ent->client->sess.captain = TEAM_FREE; } else if (ent->client->sess.captain == TEAM_BLUE) { trap_Cvar_Set("g_RQ3_team2ready", "0"); - trap_SendServerCommand( -1, va("print \"%s is no longer %s's Captain.\n\"", + trap_SendServerCommand( -1, va("print \"%s^7 is no longer %s's Captain.\n\"", ent->client->pers.netname, g_RQ3_team2name.string)); ent->client->sess.captain = TEAM_FREE; } else { if (!checkCaptain(ent->client->sess.savedTeam)) { ent->client->sess.captain = ent->client->sess.savedTeam; - trap_SendServerCommand( -1, va("print \"%s is now %s's Captain.\n\"", + trap_SendServerCommand( -1, va("print \"%s^7 is now %s's Captain.\n\"", ent->client->pers.netname, ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string)); } else @@ -236,7 +236,7 @@ void checkRefVotes() { ent = g_entities + refVotes[0]; Com_sprintf(nr, sizeof(nr), "%i", refVotes[0]); trap_Cvar_Set("g_RQ3_RefID", nr); - trap_SendServerCommand( -1, va("cp \"%s is the new Referee.\n\"",ent->client->pers.netname)); + trap_SendServerCommand( -1, va("cp \"%s^7 is the new Referee.\n\"",ent->client->pers.netname)); refVotes[0] = refVotes[1] = -1; } } @@ -271,7 +271,7 @@ void MM_Referee_f(gentity_t *ent) { buff = ConcatArgs( 1 ); if((ref = getEntByName(buff))!=NULL) { refVotes[captain - 1] = ref-g_entities; - trap_SendServerCommand(-1,va("print \"%s has voted %s for referee\n\"",ent->client->pers.netname,ref->client->pers.netname )); + trap_SendServerCommand(-1,va("print \"%s^7 has voted %s^7 for referee\n\"",ent->client->pers.netname,ref->client->pers.netname )); checkRefVotes(); } else {