stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-22 02:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Coins don't melt in lava and lavafalls have displayoffset 1

Browse source
This commit is contained in:
MascaraSnake 2019-10-05 20:00:54 +02:00
parent 99220ae48b
commit 16d077fde3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -12765,7 +12765,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // speed
30*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
1, // display offset
100, // mass
0, // damage
sfx_None, // activesound

4
src/p_mobj.c
View file

@ -8834,13 +8834,13 @@ void P_MobjThinker(mobj_t *mobj)
}
break;
case MT_RING:
case MT_COIN:
case MT_REDTEAMRING:
case MT_BLUETEAMRING:
P_KillRingsInLava(mobj);
if (P_MobjWasRemoved(mobj))
return;
/* FALLTHRU */
case MT_COIN:
case MT_BLUESPHERE:
case MT_BOMBSPHERE:
case MT_NIGHTSCHIP:
@ -8854,11 +8854,11 @@ void P_MobjThinker(mobj_t *mobj)
return;
// Flung items
case MT_FLINGRING:
case MT_FLINGCOIN:
P_KillRingsInLava(mobj);
if (P_MobjWasRemoved(mobj))
return;
/* FALLTHRU */
case MT_FLINGCOIN:
case MT_FLINGBLUESPHERE:
case MT_FLINGNIGHTSCHIP:
if (mobj->flags2 & MF2_NIGHTSPULL)