From d9fa45d85061464e1183d01f0130783905e44a46 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Sun, 2 Dec 2018 02:29:47 -0500 Subject: [PATCH] Back to numstarposts/2 --- src/k_kart.c | 4 ++-- src/p_inter.c | 2 +- src/p_spec.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index a40d4838..b462d961 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -8046,10 +8046,10 @@ static void K_drawCheckpointDebugger(void) if (stplyr != &players[displayplayer]) // only for p1 return; - if (stplyr->starpostnum >= (numstarposts - (2*numstarposts)/5)) + if (stplyr->starpostnum >= (numstarposts - (numstarposts/2))) V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Can finish)", stplyr->starpostnum, numstarposts)); else - V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, ((2*numstarposts)/5 + stplyr->starpostnum))); + V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, ((numstarposts/2) + stplyr->starpostnum))); V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", stplyr->kartstuff[k_prevcheck], stplyr->kartstuff[k_nextcheck])); } diff --git a/src/p_inter.c b/src/p_inter.c index d7f419c9..7c599016 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1440,7 +1440,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) } // // SRB2kart: make sure the player will have enough checkpoints to touch - if (circuitmap && special->health >= ((2*numstarposts)/5 + player->starpostnum)) + if (circuitmap && special->health >= ((numstarposts/2) + player->starpostnum)) { // blatant reuse of a variable that's normally unused in circuit if (!player->tossdelay) diff --git a/src/p_spec.c b/src/p_spec.c index 97c88dc8..ea7b0c4d 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -4193,12 +4193,12 @@ DoneSection2: case 10: // Finish Line // SRB2kart - 150117 - if (G_RaceGametype() && (player->starpostnum >= (numstarposts - (2*numstarposts)/5) || player->exiting)) + if (G_RaceGametype() && (player->starpostnum >= (numstarposts - (numstarposts/2)) || player->exiting)) player->kartstuff[k_starpostwp] = player->kartstuff[k_waypoint] = 0; // if (G_RaceGametype() && !player->exiting) { - if (player->starpostnum >= (numstarposts - (2*numstarposts)/5)) // srb2kart: must have touched *enough* starposts (was originally "(player->starpostnum == numstarposts)") + if (player->starpostnum >= (numstarposts - (numstarposts/2))) // srb2kart: must have touched *enough* starposts (was originally "(player->starpostnum == numstarposts)") { UINT8 nump = 0;