From d83cbe0b725ff5794d131d731984d6a64815d344 Mon Sep 17 00:00:00 2001 From: ZTsukei Date: Sat, 18 Feb 2017 16:45:28 -0500 Subject: [PATCH] =?UTF-8?q?BooTake=20working=20now,=20maybe=20BooSteal=20d?= =?UTF-8?q?oes=20too=20=C2=AF\=5F(=E3=83=84)=5F/=C2=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/p_spec.c | 4 ++-- src/p_user.c | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/p_spec.c b/src/p_spec.c index 131dd7c8..4050ffdf 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -7113,8 +7113,8 @@ void T_Friction(friction_t *f) // friction works for all mobj's // (or at least MF_PUSHABLEs, which is all I care about anyway) if ((!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) && thing->z == thing->floorz) && (thing->player - && (thing->player->kartstuff[k_startimer] && thing->player->kartstuff[k_bootaketimer] - && thing->player->kartstuff[k_mushroomtimer] && thing->player->kartstuff[k_growshrinktimer] <= 0))) + && (thing->player->kartstuff[k_startimer] == 0 && thing->player->kartstuff[k_bootaketimer] == 0 + && thing->player->kartstuff[k_mushroomtimer] == 0 && thing->player->kartstuff[k_growshrinktimer] <= 0))) { if (f->roverfriction) { diff --git a/src/p_user.c b/src/p_user.c index cd245cd4..5b29dc25 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -9309,10 +9309,13 @@ void P_PlayerThink(player_t *player) // Flash player after being hit. if (!(player->pflags & PF_NIGHTSMODE)) { - if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1)) - player->mo->flags2 |= MF2_DONTDRAW; - else - player->mo->flags2 &= ~MF2_DONTDRAW; + if (player->kartstuff[k_bootaketimer] == 0) // SRB2kart - fixes boo not flashing when it should + { + if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1)) + player->mo->flags2 |= MF2_DONTDRAW; + else + player->mo->flags2 &= ~MF2_DONTDRAW; + } } else if (player->mo->tracer) {