From: Rudolf Polzer Date: Thu, 10 Jan 2013 15:49:31 +0000 (+0100) Subject: scores sorting: use strict and nonstrict sorting where useful X-Git-Tag: xonotic-v0.7.0~131 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=257260e1cc4af6303f76826b3b9a991496f08bbc;p=xonotic%2Fxonotic-data.pk3dir.git scores sorting: use strict and nonstrict sorting where useful --- diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index d37e1808e..af982ad46 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -185,6 +185,9 @@ float HUD_ComparePlayerScores(entity left, entity right) return r; } + if (left.sv_entnum < right.sv_entnum) + return true; + return false; } @@ -224,6 +227,9 @@ float HUD_CompareTeamScores(entity left, entity right) return r; } + if (left.team < right.team) + return true; + return false; } diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc index 9c0d38c16..46e30bb99 100644 --- a/qcsrc/server/playerstats.qc +++ b/qcsrc/server/playerstats.qc @@ -369,7 +369,7 @@ void PlayerStats_AddGlobalInfo(entity p) void PlayerStats_EndMatch(float finished) { entity p, winner; - winner = PlayerScore_Sort(score_dummyfield); + winner = PlayerScore_Sort(score_dummyfield, 0); FOR_EACH_CLIENT(p) // spectators intentionally not included { //PlayerStats_Accuracy(p); // stats are already written with PlayerStats_AddGlobalInfo(entity), don't double them up. diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index 6d7648555..6aaa19803 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -1026,7 +1026,7 @@ void race_ReadyRestart() Score_NicePrint(world); race_ClearRecords(); - PlayerScore_Sort(race_place); + PlayerScore_Sort(race_place, 1); entity e; FOR_EACH_CLIENT(e) diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index 102dd6a33..25d454fdf 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -10,9 +10,9 @@ var .float teamscores_primary; float scores_flags_primary; float teamscores_flags_primary; -vector ScoreField_Compare(entity t1, entity t2, .float field, float fieldflags, vector previous) // returns: cmp value, best prio +vector ScoreField_Compare(entity t1, entity t2, .float field, float fieldflags, vector previous, float strict) // returns: cmp value, best prio { - if(!(fieldflags & SFL_SORT_PRIO_MASK)) // column does not sort + if(!strict && !(fieldflags & SFL_SORT_PRIO_MASK)) // column does not sort return previous; if(fieldflags & SFL_SORT_PRIO_MASK < previous_y) return previous; @@ -123,7 +123,7 @@ float TeamScore_Add(entity player, float scorefield, float score) return TeamScore_AddToTeam(player.team, scorefield, score); } -float TeamScore_Compare(entity t1, entity t2) +float TeamScore_Compare(entity t1, entity t2, float strict) { if(!t1 || !t2) return (!t2) - !t1; @@ -133,8 +133,12 @@ float TeamScore_Compare(entity t1, entity t2) { var .float f; f = teamscores[i]; - result = ScoreField_Compare(t1, t2, f, teamscores_flags[i], result); + result = ScoreField_Compare(t1, t2, f, teamscores_flags[i], result, strict); } + + if (result_x == 0 && strict) + result_x = t1.team - t2.team; + return result_x; } @@ -352,7 +356,7 @@ float PlayerTeamScore_Add(entity player, float pscorefield, float tscorefield, f return r; } -float PlayerScore_Compare(entity t1, entity t2) +float PlayerScore_Compare(entity t1, entity t2, float strict) { if(!t1 || !t2) return (!t2) - !t1; @@ -362,8 +366,12 @@ float PlayerScore_Compare(entity t1, entity t2) { var .float f; f = scores[i]; - result = ScoreField_Compare(t1, t2, f, scores_flags[i], result); + result = ScoreField_Compare(t1, t2, f, scores_flags[i], result, strict); } + + if (result_x == 0 && strict) + result_x = num_for_edict(t1.owner) - num_for_edict(t2.owner); + return result_x; } @@ -409,7 +417,7 @@ void WinningConditionHelper() for(t = 0; t < 16; ++t) { sk = teamscorekeepers[t]; - c = TeamScore_Compare(winnerscorekeeper, sk); + c = TeamScore_Compare(winnerscorekeeper, sk, 1); if(c < 0) { WinningConditionHelper_secondteam = WinningConditionHelper_winnerteam; @@ -419,7 +427,7 @@ void WinningConditionHelper() } else { - c = TeamScore_Compare(secondscorekeeper, sk); + c = TeamScore_Compare(secondscorekeeper, sk, 1); if(c < 0) { WinningConditionHelper_secondteam = t + 1; @@ -428,7 +436,7 @@ void WinningConditionHelper() } } - WinningConditionHelper_equality = (TeamScore_Compare(winnerscorekeeper, secondscorekeeper) == 0); + WinningConditionHelper_equality = (TeamScore_Compare(winnerscorekeeper, secondscorekeeper, 0) == 0); if(WinningConditionHelper_equality) WinningConditionHelper_winnerteam = WinningConditionHelper_secondteam = -1; @@ -449,7 +457,7 @@ void WinningConditionHelper() FOR_EACH_PLAYER(p) { sk = p.scorekeeper; - c = PlayerScore_Compare(winnerscorekeeper, sk); + c = PlayerScore_Compare(winnerscorekeeper, sk, 1); if(c < 0) { WinningConditionHelper_second = WinningConditionHelper_winner; @@ -459,7 +467,7 @@ void WinningConditionHelper() } else { - c = PlayerScore_Compare(secondscorekeeper, sk); + c = PlayerScore_Compare(secondscorekeeper, sk, 1); if(c < 0) { WinningConditionHelper_second = p; @@ -468,7 +476,7 @@ void WinningConditionHelper() } } - WinningConditionHelper_equality = (PlayerScore_Compare(winnerscorekeeper, secondscorekeeper) == 0); + WinningConditionHelper_equality = (PlayerScore_Compare(winnerscorekeeper, secondscorekeeper, 0) == 0); if(WinningConditionHelper_equality) WinningConditionHelper_winner = WinningConditionHelper_second = world; @@ -657,7 +665,7 @@ string GetTeamScoreString(float tm, float shortString) return out; } -float PlayerTeamScore_Compare(entity p1, entity p2) +float PlayerTeamScore_Compare(entity p1, entity p2, float strict) { if(teamscores_entities_count) if(p1.team != p2.team) @@ -666,19 +674,17 @@ float PlayerTeamScore_Compare(entity p1, entity p2) float r; t1 = teamscorekeepers[p1.team - 1]; t2 = teamscorekeepers[p2.team - 1]; - r = TeamScore_Compare(t1, t2); - if(r == 0) // ensure a deterministic order - r = p1.team - p2.team; + r = TeamScore_Compare(t1, t2, strict); return r; } - return PlayerScore_Compare(p1.scorekeeper, p2.scorekeeper); + return PlayerScore_Compare(p1.scorekeeper, p2.scorekeeper, strict); } -entity PlayerScore_Sort(.float field) +entity PlayerScore_Sort(.float field, float strict) { entity p, plist, pprev, pbest, pbestprev, pfirst, plast; - float i; + float i, j; plist = world; @@ -694,14 +700,14 @@ entity PlayerScore_Sort(.float field) pfirst = plast = world; - i = 0; + i = j = 0; while(plist) { pprev = pbestprev = world; pbest = plist; for(p = plist; (pprev = p), (p = p.chain); ) { - if(PlayerTeamScore_Compare(p, pbest) > 0) + if(PlayerTeamScore_Compare(p, pbest, strict) > 0) { pbest = p; pbestprev = pprev; @@ -715,6 +721,10 @@ entity PlayerScore_Sort(.float field) pbestprev.chain = pbest.chain; pbest.chain = world; + ++i; + if(!plast || PlayerTeamScore_Compare(plast, pbest, 0)) + j = i; + pbest.field = ++i; if not(pfirst) @@ -857,7 +867,7 @@ void Score_NicePrint(entity to) ++t; w = bound(6, floor(SCORESWIDTH / t - 1), 9); - p = PlayerScore_Sort(score_dummyfield); + p = PlayerScore_Sort(score_dummyfield, 0); t = -1; if(!teamscores_entities_count) diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh index 3ac0b03b5..96f15bc80 100644 --- a/qcsrc/server/scores.qh +++ b/qcsrc/server/scores.qh @@ -118,4 +118,4 @@ string GetTeamScoreString(float tm, float shortString); * 1. Non-players get 0 written into that field. * Returns the beginning of a sorted chain of the non-spectators. */ -entity PlayerScore_Sort(.float field); +entity PlayerScore_Sort(.float field, float strict);