-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
- result = ScoreField_Compare(t1, t2, f, teamscores_flags[i], result);
+ result = ScoreField_Compare(t1, t2, f, teamscores_flags[i], result, strict);
Net_LinkEntity(scores_initialized, FALSE, 0, ScoreInfo_SendEntity);
}
if(teams >= 1)
Net_LinkEntity(scores_initialized, FALSE, 0, ScoreInfo_SendEntity);
}
if(teams >= 1)
- result = ScoreField_Compare(t1, t2, f, scores_flags[i], result);
+ result = ScoreField_Compare(t1, t2, f, scores_flags[i], result, strict);
s = GetGametype();
s = strcat(s, ":", autocvar_g_xonoticversion);
s = strcat(s, ":P", ftos(cvar_purechanges_count));
s = GetGametype();
s = strcat(s, ":", autocvar_g_xonoticversion);
s = strcat(s, ":P", ftos(cvar_purechanges_count));
s = strcat(s, "::", GetPlayerScoreString(world, 1)); // make this 1 once we can, note: this doesn't contain any :<letter>
fullstatus = autocvar_g_full_getstatus_responses;
s = strcat(s, "::", GetPlayerScoreString(world, 1)); // make this 1 once we can, note: this doesn't contain any :<letter>
fullstatus = autocvar_g_full_getstatus_responses;
if(WinningConditionHelper_equality)
WinningConditionHelper_winnerteam = WinningConditionHelper_secondteam = -1;
if(WinningConditionHelper_equality)
WinningConditionHelper_winnerteam = WinningConditionHelper_secondteam = -1;
if(WinningConditionHelper_equality)
WinningConditionHelper_winner = WinningConditionHelper_second = world;
if(WinningConditionHelper_equality)
WinningConditionHelper_winner = WinningConditionHelper_second = world;
- r = TeamScore_Compare(t1, t2);
- if(r == 0) // ensure a deterministic order
- r = p1.team - p2.team;
+ r = TeamScore_Compare(t1, t2, strict);
{
entity p, plist, pprev, pbest, pbestprev, pfirst, plast;
{
entity p, plist, pprev, pbest, pbestprev, pfirst, plast;
while(plist)
{
pprev = pbestprev = world;
pbest = plist;
for(p = plist; (pprev = p), (p = p.chain); )
{
while(plist)
{
pprev = pbestprev = world;
pbest = plist;
for(p = plist; (pprev = p), (p = p.chain); )
{