stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 04:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'floating-item-fixes' into 'master'

Browse source 
Floating item fixes

See merge request KartKrew/Kart!116
This commit is contained in:
Sal 2018-11-29 08:00:56 -05:00
commit 594fae05ff
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/p_mobj.c
View file

@ -7940,7 +7940,12 @@ void P_MobjThinker(mobj_t *mobj)
{
if (mobj->flags & MF_NOCLIPTHING)
{
if (P_IsObjectOnGround(mobj))
if (P_CheckDeathPitCollide(mobj))
{
P_RemoveMobj(mobj);
return;
}
else if (P_IsObjectOnGround(mobj))
{
mobj->momx = 1;
mobj->momy = 0;
@ -7986,11 +7991,15 @@ void P_MobjThinker(mobj_t *mobj)
mobj->sprite = SPR_ITEM;
mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE;
break;
case KITEM_SPB:
case KITEM_SHRINK:
indirectitemcooldown = 20*TICRATE;
/* FALLTHRU */
default:
mobj->sprite = SPR_ITEM;
mobj->frame = FF_FULLBRIGHT|FF_PAPERSPRITE|(mobj->threshold);
break;
}
}
break;
}
case MT_ORBINAUT: