From 71b7db4e0dfc017b6407a71ba73abd21983e2d09 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Wed, 12 Oct 2016 22:06:12 +0100 Subject: [PATCH] Refinements to flashing. --- src/p_local.h | 2 +- src/p_mobj.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/p_local.h b/src/p_local.h index 041a2150d..b1c9366c5 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -64,7 +64,7 @@ #define mariomode (maptol & TOL_MARIO) #define shortmario(player) ((player && mariomode && !player->powers[pw_shield]) ? 1 : 0) -#define MARIOFLASHINGTICS 19 +#define MARIOFLASHINGTICS 21 #define P_GetPlayerHeight(player) (FixedMul(player->height, player->mo->scale) >> shortmario(player)) #define P_GetPlayerSpinHeight(player) (FixedMul(player->spinheight, player->mo->scale) >> shortmario(player)) diff --git a/src/p_mobj.c b/src/p_mobj.c index 95403995b..de544362c 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -4066,7 +4066,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj) if (!mobj->player->powers[pw_nocontrol]++) mobj->player->powers[pw_nocontrol]++; - if (!(mobj->player->powers[pw_marioflashing] % 4)) + if (!((--mobj->player->powers[pw_marioflashing] - 1) % 5)) { UINT16 shieldswitch = mobj->player->powers[pw_shield]; mobj->player->powers[pw_shield] = mobj->movecount; @@ -4088,7 +4088,6 @@ static void P_PlayerMobjThinker(mobj_t *mobj) P_SpawnShieldOrb(mobj->player); } - mobj->player->powers[pw_marioflashing]--; if (mobj->player->powers[pw_flashing] && mobj->player->powers[pw_flashing] < UINT16_MAX && mobj->player->powers[pw_flashing] > flashingtics) if (--(mobj->player->powers[pw_flashing]) == flashingtics) mobj->player->powers[pw_flashing]--;