thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-11 17:22:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no-squish' into 'master'

Browse source 
Add the MF_NOSQUISH flag, disables squash and stretch

See merge request KartKrew/Kart!501
This commit is contained in:
SteelT 2021-12-21 06:20:59 +00:00
commit cf3e92c293
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/deh_tables.c
View file

@ -5806,6 +5806,8 @@ const char *const MOBJFLAG_LIST[] = {
"GRENADEBOUNCE",
"RUNSPAWNFUNC",
"DONTENCOREMAP",
"PICKUPFROMBELOW",
"NOSQUISH",
NULL
};

3
src/p_mobj.c
View file

@ -3574,7 +3574,8 @@ static void P_CheckFloatbobPlatforms(mobj_t *mobj)
static void P_SquishThink(mobj_t *mobj)
{
if (!(mobj->eflags & MFE_SLOPELAUNCHED))
if (!(mobj->flags & MF_NOSQUISH) &&
!(mobj->eflags & MFE_SLOPELAUNCHED))
{
K_Squish(mobj);
}

2
src/p_mobj.h
View file

@ -159,6 +159,8 @@ typedef enum
MF_DONTENCOREMAP = 1<<28,
// Hitbox extends just as far below as above.
MF_PICKUPFROMBELOW = 1<<29,
// Disable momentum-based squash and stretch.
MF_NOSQUISH = 1<<30,
// free: to and including 1<<31
} mobjflag_t;