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

Added total players/subs & fixed ping bug

Browse source
This commit is contained in:
Bryce Hutchings 2002-07-02 07:38:55 +00:00
parent d86c1994f8
commit d0e18f915a
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reaction/cgame/cg_scoreboard.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.39 2002/07/02 07:38:55 niceass
// Added total players/subs & fixed ping bug
//
// Revision 1.38 2002/07/02 07:21:41 niceass // Revision 1.38 2002/07/02 07:21:41 niceass
// untested matchmode ping determination // untested matchmode ping determination
// //
@ -161,6 +164,9 @@ int TeamAveragePing(team_t team)
} }
} }
if (!Players)
return 0;
for (i = 0; i < cg.numScores; i++) { for (i = 0; i < cg.numScores; i++) {
Score = &cg.scores[i]; Score = &cg.scores[i];
ci = &cgs.clientinfo[Score->client]; ci = &cgs.clientinfo[Score->client];
@ -384,12 +390,18 @@ static int CG_TeamplayScoreboard(void)
if (cg_RQ3_matchmode.integer) { if (cg_RQ3_matchmode.integer) {
int mins, secs; int mins, secs;
char Time[16]; char Time[16];
char *pingFair;
mins = (int) floor(cg.matchTime / 60.0f); mins = (int) floor(cg.matchTime / 60.0f);
secs = cg.matchTime - (mins * 60); secs = cg.matchTime - (mins * 60);
Com_sprintf(Time, 16, "%d:%02d", mins, secs); Com_sprintf(Time, 16, "%d:%02d", mins, secs);
DrawRightStripText(y, SB_FONTSIZEH, va("Matchtime: %s", Time), 100, colorWhite); if (abs(TeamAveragePing(TEAM_RED) - TeamAveragePing(TEAM_BLUE)) <= 40)
pingFair = "PINGS FAIR";
else
pingFair = "PINGS UNFAIR";
DrawRightStripText(y, SB_FONTSIZEH, va("%s - Matchtime: %s", pingFair, Time), 100, colorWhite);
y += SB_FONTSIZEH + SB_PADDING * 2 + 2; y += SB_FONTSIZEH + SB_PADDING * 2 + 2;
} }
@ -438,11 +450,11 @@ static int CG_TeamplayScoreboard(void)
DrawLeftStripText(y, SB_FONTSIZEH, cg_RQ3_team1name.string, 100, colorBlack); DrawLeftStripText(y, SB_FONTSIZEH, cg_RQ3_team1name.string, 100, colorBlack);
if (cg_RQ3_matchmode.integer) if (cg_RQ3_matchmode.integer)
DrawRightStripText(y, SB_FONTSIZEH, va("%s - Wins: %d", DrawRightStripText(y, SB_FONTSIZEH, va("%d/%d - %s - Wins: %d", Reds, RedSubs,
cg.team1ready ? "Ready" : "Not Ready", cg.teamScores[0]), cg.team1ready ? "Ready" : "Not Ready", cg.teamScores[0]),
100, colorWhite); 100, colorWhite);
else else
DrawRightStripText(y, SB_FONTSIZEH, va("Wins: %d", cg.teamScores[0]), 100, colorWhite); DrawRightStripText(y, SB_FONTSIZEH, va("%d/%d - Wins: %d", Reds, RedSubs, cg.teamScores[0]), 100, colorWhite);
CG_ScoreBoardHead (TEAM_RED, (SCREEN_WIDTH - SB_WIDTH) / 2 - 44, y - 2, 48, 48); CG_ScoreBoardHead (TEAM_RED, (SCREEN_WIDTH - SB_WIDTH) / 2 - 44, y - 2, 48, 48);
@ -528,11 +540,11 @@ static int CG_TeamplayScoreboard(void)
DrawLeftStripText(y, SB_FONTSIZEH, cg_RQ3_team2name.string, 100, colorBlack); DrawLeftStripText(y, SB_FONTSIZEH, cg_RQ3_team2name.string, 100, colorBlack);
if (cg_RQ3_matchmode.integer) if (cg_RQ3_matchmode.integer)
DrawRightStripText(y, SB_FONTSIZEH, va("%s - Wins: %d", DrawRightStripText(y, SB_FONTSIZEH, va("%d/%d - %s - Wins: %d", Blues, BlueSubs,
cg.team2ready ? "Ready" : "Not Ready", cg.teamScores[1]), cg.team2ready ? "Ready" : "Not Ready", cg.teamScores[1]),
100, colorWhite); 100, colorWhite);
else else
DrawRightStripText(y, SB_FONTSIZEH, va("Wins: %d", cg.teamScores[1]), 100, colorWhite); DrawRightStripText(y, SB_FONTSIZEH, va("%d/%d - Wins: %d", Blues, BlueSubs, cg.teamScores[1]), 100, colorWhite);
CG_ScoreBoardHead (TEAM_BLUE, (SCREEN_WIDTH - SB_WIDTH) / 2 - 44, y - 2, 48, 48); CG_ScoreBoardHead (TEAM_BLUE, (SCREEN_WIDTH - SB_WIDTH) / 2 - 44, y - 2, 48, 48);