stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-17 23:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

I like this timing more.

Browse source
This commit is contained in:
toasterbabe 2016-10-12 23:55:16 +01:00
parent a36912baef
commit 4997564d30
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_local.h
View file

@ -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))

2
src/p_mobj.c
View file

@ -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;