From 4997564d303213ffe25fa9170c26461edbd82519 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Wed, 12 Oct 2016 23:55:16 +0100 Subject: [PATCH] I like this timing more. --- src/p_local.h | 2 +- src/p_mobj.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_local.h b/src/p_local.h index f10ac2a4d..4568fe4d8 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] && !objectplacing) ? 1 : 0) -#define MARIOFLASHINGTICS 21 +#define MARIOFLASHINGTICS TICRATE/2 #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 72b2eaf1d..50a80ebea 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] - 1) % 5)) + if (!(--mobj->player->powers[pw_marioflashing] % 4)) { UINT16 shieldswitch = mobj->player->powers[pw_shield]; mobj->player->powers[pw_shield] = mobj->movecount;