stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-16 17:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move numingame count after the balloon check

Browse source
This commit is contained in:
TehRealSalt 2018-07-01 15:25:10 -04:00
parent fb975e7ae7
commit 70c1420a51
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_kart.c
View file

@ -3846,11 +3846,11 @@ void K_CalculateBattleWanted(void)
if (players[i].exiting) // We're done, don't calculate. if (players[i].exiting) // We're done, don't calculate.
return; return;
numingame++;
if (players[i].kartstuff[k_balloon] <= 0) // Not alive, so don't do anything else if (players[i].kartstuff[k_balloon] <= 0) // Not alive, so don't do anything else
continue; continue;
numingame++;
if (bestballoon == -1 || players[i].kartstuff[k_balloon] > bestballoon) if (bestballoon == -1 || players[i].kartstuff[k_balloon] > bestballoon)
{ {
bestballoon = players[i].kartstuff[k_balloon]; bestballoon = players[i].kartstuff[k_balloon];
@ -3897,9 +3897,9 @@ void K_CalculateBattleWanted(void)
} }
else else
{ {
// Do not add more than 2 wanted times that are tied with others. // Do not add *any* more people if there's more than 1 wanted times that are tied with others.
// This could theoretically happen very easily if people don't hit each other for a while after the start of a match. // This could theoretically happen very easily if people don't hit each other for a while after the start of a match.
// (I will be sincerely impressed if more than 2 people tie // (I will be sincerely impressed if more than 2 people tie after people start hitting each other though)
if (camppos[nextcamppos] == -1 // Out of entries if (camppos[nextcamppos] == -1 // Out of entries
|| ties >= 2) // Already counted ties || ties >= 2) // Already counted ties