lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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 0, // speed
30*FRACUNIT, // radius 30*FRACUNIT, // radius
32*FRACUNIT, // height 32*FRACUNIT, // height
0, // display offset 1, // display offset
100, // mass 100, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound

4
src/p_mobj.c
View File

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