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

removed team leaders in all gametypes and changed some text from centerprint to console print

Browse source
This commit is contained in:
Bryce Hutchings 2002-07-11 04:31:07 +00:00
parent 468192504f
commit 29089f6025
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.155 2002/07/11 04:31:07 niceass
// removed team leaders in all gametypes and changed some text from centerprint to console print
//
// Revision 1.154 2002/07/09 05:41:48 niceass // Revision 1.154 2002/07/09 05:41:48 niceass
// scoreboard fix // scoreboard fix
// //
@ -903,16 +906,16 @@ void BroadcastTeamChange(gclient_t * client, int oldTeam)
} }
} else { } else {
if (client->sess.sessionTeam == TEAM_RED) { if (client->sess.sessionTeam == TEAM_RED) {
trap_SendServerCommand(-1, va("cp \"%s" S_COLOR_WHITE " joined the red team.\n\"", trap_SendServerCommand(-1, va("print \"%s" S_COLOR_WHITE " joined the red team.\n\"",
client->pers.netname)); client->pers.netname));
} else if (client->sess.sessionTeam == TEAM_BLUE) { } else if (client->sess.sessionTeam == TEAM_BLUE) {
trap_SendServerCommand(-1, va("cp \"%s" S_COLOR_WHITE " joined the blue team.\n\"", trap_SendServerCommand(-1, va("print \"%s" S_COLOR_WHITE " joined the blue team.\n\"",
client->pers.netname)); client->pers.netname));
} else if (client->sess.sessionTeam == TEAM_SPECTATOR && oldTeam != TEAM_SPECTATOR) { } else if (client->sess.sessionTeam == TEAM_SPECTATOR && oldTeam != TEAM_SPECTATOR) {
trap_SendServerCommand(-1, va("cp \"%s" S_COLOR_WHITE " joined the spectators.\n\"", trap_SendServerCommand(-1, va("print \"%s" S_COLOR_WHITE " joined the spectators.\n\"",
client->pers.netname)); client->pers.netname));
} else if (client->sess.sessionTeam == TEAM_FREE) { } else if (client->sess.sessionTeam == TEAM_FREE) {
trap_SendServerCommand(-1, va("cp \"%s" S_COLOR_WHITE " joined the battle.\n\"", trap_SendServerCommand(-1, va("print \"%s" S_COLOR_WHITE " joined the battle.\n\"",
client->pers.netname)); client->pers.netname));
} }
} }
@ -928,7 +931,8 @@ void SetTeam(gentity_t * ent, char *s)
int team, oldTeam, clientNum; int team, oldTeam, clientNum;
gclient_t *client; gclient_t *client;
spectatorState_t specState = 0; spectatorState_t specState = 0;
int specClient = 0, teamLeader, teamsave; int specClient = 0, teamsave;
//int teamLeader;
// //
// see what change is requested // see what change is requested
@ -1077,6 +1081,8 @@ void SetTeam(gentity_t * ent, char *s)
client->sess.teamLeader = qfalse; client->sess.teamLeader = qfalse;
// JBravo: no teamleader crap in teamplay mode. // JBravo: no teamleader crap in teamplay mode.
// NiceAss: I see no reason for this in CTB or any other gametype.
/*
if ((team == TEAM_RED || team == TEAM_BLUE) && g_gametype.integer != GT_TEAMPLAY) { if ((team == TEAM_RED || team == TEAM_BLUE) && g_gametype.integer != GT_TEAMPLAY) {
teamLeader = TeamLeader(team); teamLeader = TeamLeader(team);
// if there is no team leader or the team leader is a bot and this client is not a bot // if there is no team leader or the team leader is a bot and this client is not a bot
@ -1085,12 +1091,16 @@ void SetTeam(gentity_t * ent, char *s)
SetLeader(team, clientNum); SetLeader(team, clientNum);
} }
} }
*/
// make sure there is a team leader on the team the player came from // make sure there is a team leader on the team the player came from
// JBravo: no teamleader crap in teamplay mode. // JBravo: no teamleader crap in teamplay mode.
// NiceAss: I see no reason for this in CTB or any other gametype.
/*
if ((oldTeam == TEAM_RED || oldTeam == TEAM_BLUE) && g_gametype.integer != GT_TEAMPLAY) { if ((oldTeam == TEAM_RED || oldTeam == TEAM_BLUE) && g_gametype.integer != GT_TEAMPLAY) {
CheckTeamLeader(oldTeam); CheckTeamLeader(oldTeam);
} }
*/
BroadcastTeamChange(client, oldTeam); BroadcastTeamChange(client, oldTeam);
// get and distribute relevent paramters // get and distribute relevent paramters