rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-11 07:42:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Color fixes for player names

Browse source
This commit is contained in:
Richard Allen 2002-06-05 23:53:05 +00:00
parent d14aafa54d
commit 364c8966e3
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reaction/cgame/cg_event.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $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 // Revision 1.62 2002/06/05 09:42:30 niceass
// removed old death messages // removed old death messages
// //
@ -413,14 +416,14 @@ static void CG_JumpKick ( entityState_t *ent )
else else
Q_strncpyz(sex, "its", sizeof(sex)); 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); ci->name, cg_weapons[ent->weapon].item->pickup_name, sex);
} }
else if (ent->weapon && target == cg.clientNum) else if (ent->weapon && target == cg.clientNum)
{ {
// this client was the kicked // this client was the kicked
ci = &cgs.clientinfo[attacker]; 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 // everyone hears this

9
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $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 // Revision 1.119 2002/06/05 04:57:50 niceass
// "team" command fix // "team" command fix
// //
@ -1797,7 +1800,7 @@ void Cmd_CallVote_f( gentity_t *ent ) {
Com_sprintf( level.voteDisplayString, sizeof( level.voteDisplayString ), "%s", level.voteString ); 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 // start the voting, the caller autoamtically votes yes
level.voteTime = level.time; level.voteTime = level.time;
@ -1962,7 +1965,7 @@ void Cmd_CallTeamVote_f( gentity_t *ent ) {
if ( level.clients[i].pers.connected == CON_DISCONNECTED ) if ( level.clients[i].pers.connected == CON_DISCONNECTED )
continue; continue;
if (level.clients[i].sess.sessionTeam == team) 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 // start the voting, the caller autoamtically votes yes
@ -2792,7 +2795,7 @@ void Cmd_PlayerStats_f( gentity_t *ent )
{ {
//char textbuf[1024]; //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 \"----------------------------------\n\""));
trap_SendServerCommand( ent-g_entities, va("print \"| Weapon | Accuracy | Hits/Shots |\n\"")); trap_SendServerCommand( ent-g_entities, va("print \"| Weapon | Accuracy | Hits/Shots |\n\""));
trap_SendServerCommand( ent-g_entities, va("print \"----------------------------------\n\"")); trap_SendServerCommand( ent-g_entities, va("print \"----------------------------------\n\""));

14
reaction/game/g_matchmode.c
View file

@ -60,12 +60,12 @@ void MM_Sub_f (gentity_t *ent) {
player_die (ent, ent, ent, 100000, MOD_SUICIDE); player_die (ent, ent, ent, 100000, MOD_SUICIDE);
} }
ent->client->sess.sub = ent->client->sess.savedTeam; 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->pers.netname,
ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string)); ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string));
} else { } else {
ent->client->sess.sub = TEAM_FREE; 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->pers.netname,
ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string)); 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) { if (ent->client->sess.captain == TEAM_RED) {
trap_Cvar_Set("g_RQ3_team1ready", "0"); 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->pers.netname, g_RQ3_team1name.string));
ent->client->sess.captain = TEAM_FREE; ent->client->sess.captain = TEAM_FREE;
} else if (ent->client->sess.captain == TEAM_BLUE) { } else if (ent->client->sess.captain == TEAM_BLUE) {
trap_Cvar_Set("g_RQ3_team2ready", "0"); 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->pers.netname, g_RQ3_team2name.string));
ent->client->sess.captain = TEAM_FREE; ent->client->sess.captain = TEAM_FREE;
} else { } else {
if (!checkCaptain(ent->client->sess.savedTeam)) { if (!checkCaptain(ent->client->sess.savedTeam)) {
ent->client->sess.captain = 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->pers.netname,
ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string)); ent->client->sess.savedTeam==TEAM_BLUE ? g_RQ3_team2name.string: g_RQ3_team1name.string));
} else } else
@ -236,7 +236,7 @@ void checkRefVotes() {
ent = g_entities + refVotes[0]; ent = g_entities + refVotes[0];
Com_sprintf(nr, sizeof(nr), "%i", refVotes[0]); Com_sprintf(nr, sizeof(nr), "%i", refVotes[0]);
trap_Cvar_Set("g_RQ3_RefID", nr); 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; refVotes[0] = refVotes[1] = -1;
} }
} }
@ -271,7 +271,7 @@ void MM_Referee_f(gentity_t *ent) {
buff = ConcatArgs( 1 ); buff = ConcatArgs( 1 );
if((ref = getEntByName(buff))!=NULL) { if((ref = getEntByName(buff))!=NULL) {
refVotes[captain - 1] = ref-g_entities; 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(); checkRefVotes();
} }
else { else {