rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the double lights for spectators and made the use cmd use rq3_cmd 

and made scoreboard not revieal whos alive or dead to live players.
This commit is contained in:
Richard Allen 2002-05-07 13:35:45 +00:00
parent 975ba3eb12
commit eebd48453e
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
reaction/cgame/cg_scoreboard.c
View File

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.25 2002/05/07 13:35:45 jbravo
// Fixed the double lights for spectators and made the use cmd use rq3_cmd
// and made scoreboard not revieal whos alive or dead to live players.
//
// Revision 1.24 2002/04/29 06:15:30 niceass
// ref shown as green. more mm stuff soon to come
//
@ -177,10 +181,10 @@ static void CG_DrawTeamplayClientScore( int y, score_t *score, float *Fill, floa
if (FillColor[3] > 1) FillColor[3] = 1;
// Dead?
if ( !score->alive ) {
TextColor[0] *= 0.6f;
TextColor[1] *= 0.6f;
TextColor[2] *= 0.6f;
if (!score->alive && cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR) {
TextColor[0] *= 0.5f;
TextColor[1] *= 0.5f;
TextColor[2] *= 0.5f;
}
DrawStrip(y, SB_FONTSIZEH, qtrue, qfalse, qfalse, FillColor, Boarder);

18
reaction/game/g_teamplay.c
View File

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.83 2002/05/07 13:35:45 jbravo
// Fixed the double lights for spectators and made the use cmd use rq3_cmd
// and made scoreboard not revieal whos alive or dead to live players.
//
// Revision 1.82 2002/05/06 21:41:01 slicer
// Added rq3_cmd
//
@ -297,7 +301,6 @@ void CheckTeamRules()
level.lights_delay--;
if (level.lights_delay == 1) {
level.lights_delay = 0;
//trap_SendServerCommand(-1, "lights");
trap_SendServerCommand(-1, va("rq3_cmd %i", LIGHTS));
}
}
@ -318,13 +321,6 @@ void CheckTeamRules()
checked_tie = 1;
}
if (level.lights_delay == 1) {
level.lights_delay = 0;
//Slicer
//trap_SendServerCommand(-1, "lights");
trap_SendServerCommand(-1, va("rq3_cmd %i" ,LIGHTS));
}
if (level.team_round_countdown == 1) {
level.team_round_countdown = 0;
if (BothTeamsHavePlayers()) {
@ -755,7 +751,6 @@ void SpawnPlayers()
// JBravo: lets not respawn spectators in free floating mode
if (player->client->sess.savedTeam == TEAM_SPECTATOR &&
player->client->specMode == SPECTATOR_FREE) {
trap_SendServerCommand(player-g_entities, va("rq3_cmd %i" ,LIGHTS));
continue;
}
@ -1587,7 +1582,7 @@ void RQ3_SpectatorMode(gentity_t *ent)
void RQ3_Cmd_Use_f(gentity_t *ent)
{
char *cmd, buf[128];
char *cmd;
int weapon, i;
if (!ent->client) {
@ -1689,8 +1684,7 @@ void RQ3_Cmd_Use_f(gentity_t *ent)
}
if (weapon == ent->client->ps.weapon)
return;
Com_sprintf (buf, sizeof(buf), "stuff weapon %d\n", weapon);
trap_SendServerCommand(ent-g_entities, buf);
trap_SendServerCommand(ent-g_entities, va("rq3_cmd %i weapon %i\n", STUFF, weapon));
}
void Add_TeamWound(gentity_t *attacker, gentity_t *victim, int mod)