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

MOre spec tweaks and a scoreboard fix

This commit is contained in:
Richard Allen 2002-03-30 02:54:24 +00:00
parent ae001e4294
commit b718d0169d
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
reaction/cgame/cg_scoreboard.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.18 2002/03/30 02:54:24 jbravo
// MOre spec tweaks and a scoreboard fix
//
// Revision 1.17 2002/03/24 22:57:27 niceass // Revision 1.17 2002/03/24 22:57:27 niceass
// VERY big scoreboard changes // VERY big scoreboard changes
// //
@ -269,10 +272,12 @@ static int CG_TeamplayScoreboard(void)
} }
y += 2; y += 2;
Com_sprintf(Tmp, 128, "%4d %5d %6d", (int)((float)Ping / (float)Reds), Frags, Damage); if (Reds) {
DrawStrip(y, SB_FONTSIZEH, qtrue, qtrue, qtrue, GreyL, Black); Com_sprintf(Tmp, 128, "%4d %5d %6d", (int)((float)Ping / (float)Reds), Frags, Damage);
DrawLeftStripText(y, SB_FONTSIZEH, "Averages/Totals:", 100, White); DrawStrip(y, SB_FONTSIZEH, qtrue, qtrue, qtrue, GreyL, Black);
DrawRightStripText(y, SB_FONTSIZEH, Tmp, 100, White); DrawLeftStripText(y, SB_FONTSIZEH, "Averages/Totals:", 100, White);
DrawRightStripText(y, SB_FONTSIZEH, Tmp, 100, White);
}
y += SB_FONTSIZEH+SB_PADDING*2; y += SB_FONTSIZEH+SB_PADDING*2;
// *************** BLUE TEAM ************ // *************** BLUE TEAM ************
@ -315,10 +320,12 @@ static int CG_TeamplayScoreboard(void)
} }
y += 2; y += 2;
Com_sprintf(Tmp, 128, "%4d %5d %6d", (int)((float)Ping / (float)Blues), Frags, Damage ); if (Blues) {
DrawStrip(y, SB_FONTSIZEH, qtrue, qtrue, qtrue, GreyL, Black); Com_sprintf(Tmp, 128, "%4d %5d %6d", (int)((float)Ping / (float)Blues), Frags, Damage );
DrawLeftStripText(y, SB_FONTSIZEH, "Averages/Totals:", 100, White); DrawStrip(y, SB_FONTSIZEH, qtrue, qtrue, qtrue, GreyL, Black);
DrawRightStripText(y, SB_FONTSIZEH, Tmp, 100, White); DrawLeftStripText(y, SB_FONTSIZEH, "Averages/Totals:", 100, White);
DrawRightStripText(y, SB_FONTSIZEH, Tmp, 100, White);
}
y += SB_FONTSIZEH+SB_PADDING*2; y += SB_FONTSIZEH+SB_PADDING*2;
// *************** SPECTATORS ************ // *************** SPECTATORS ************

7
reaction/game/g_active.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.64 2002/03/30 02:54:24 jbravo
// MOre spec tweaks and a scoreboard fix
//
// Revision 1.63 2002/03/30 02:29:43 jbravo // Revision 1.63 2002/03/30 02:29:43 jbravo
// Lots of spectator code updates. Removed debugshit, added some color. // Lots of spectator code updates. Removed debugshit, added some color.
// //
@ -580,7 +583,7 @@ void SpectatorThink( gentity_t *ent, usercmd_t *ucmd ) {
// Attack Button cycles throught free view, follow or zcam // Attack Button cycles throught free view, follow or zcam
if((ucmd->buttons & BUTTON_ATTACK) && !(client->oldbuttons & BUTTON_ATTACK)) { if((ucmd->buttons & BUTTON_ATTACK) && !(client->oldbuttons & BUTTON_ATTACK)) {
if (client->sess.spectatorState == SPECTATOR_FREE) { if (client->sess.spectatorState == SPECTATOR_FREE && OKtoFollow(clientNum)) {
client->sess.spectatorState = SPECTATOR_ZCAM; client->sess.spectatorState = SPECTATOR_ZCAM;
client->specMode = SPECTATOR_ZCAM; client->specMode = SPECTATOR_ZCAM;
client->ps.stats[STAT_RQ3] |= RQ3_ZCAM; client->ps.stats[STAT_RQ3] |= RQ3_ZCAM;
@ -594,7 +597,7 @@ void SpectatorThink( gentity_t *ent, usercmd_t *ucmd ) {
client->ps.stats[STAT_RQ3] &= ~RQ3_ZCAM; client->ps.stats[STAT_RQ3] &= ~RQ3_ZCAM;
Cmd_FollowCycle_f(ent, 1); Cmd_FollowCycle_f(ent, 1);
RQ3_SpectatorMode(ent); RQ3_SpectatorMode(ent);
} else { } else if (client->sess.spectatorState == SPECTATOR_FOLLOW) {
client->sess.spectatorState = SPECTATOR_FREE; client->sess.spectatorState = SPECTATOR_FREE;
client->specMode = SPECTATOR_FREE; client->specMode = SPECTATOR_FREE;
client->ps.pm_flags &= ~PMF_FOLLOW; client->ps.pm_flags &= ~PMF_FOLLOW;