From f11ee9421e1dcffbb95ba430cd7279b293636db0 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Sun, 1 Jul 2018 15:15:45 -0400 Subject: [PATCH 1/2] Quick fix --- src/k_kart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 87ae1337..e4c30400 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -4962,11 +4962,11 @@ static void K_drawKartWanted(void) } if (players[battlewanted[i]].skincolor == 0) - V_DrawFixedPatch(x*scale, y*scale, scale, V_HUDTRANS|V_SNAPTORIGHT|V_SNAPTOBOTTOM, faceprefix[p->skin], NULL); + V_DrawFixedPatch(x<skin], NULL); else { colormap = R_GetTranslationColormap(TC_RAINBOW, p->skincolor, GTC_CACHE); - V_DrawFixedPatch(x*scale, y*scale, scale, V_HUDTRANS|V_SNAPTORIGHT|V_SNAPTOBOTTOM, faceprefix[p->skin], colormap); + V_DrawFixedPatch(x<skin], colormap); } } } From 70c1420a51013bd22a65c9b9649b77b51e3490fd Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Sun, 1 Jul 2018 15:25:10 -0400 Subject: [PATCH 2/2] Move numingame count after the balloon check --- src/k_kart.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 0b67e2e1..91040869 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3846,11 +3846,11 @@ void K_CalculateBattleWanted(void) if (players[i].exiting) // We're done, don't calculate. return; - numingame++; - if (players[i].kartstuff[k_balloon] <= 0) // Not alive, so don't do anything else continue; + numingame++; + if (bestballoon == -1 || players[i].kartstuff[k_balloon] > bestballoon) { bestballoon = players[i].kartstuff[k_balloon]; @@ -3897,9 +3897,9 @@ void K_CalculateBattleWanted(void) } 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. - // (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 || ties >= 2) // Already counted ties