Merge branch 'penalty-of-death' into 'next'

I am going to die :D (closes #337)

Closes #337

See merge request STJr/SRB2!1183
This commit is contained in:
James R 2020-10-12 18:11:09 -04:00
commit d7b8d5d0f3

View file

@ -11956,9 +11956,6 @@ static mobjtype_t P_GetMobjtypeSubstitute(mapthing_t *mthing, mobjtype_t i)
return MT_SCORE1K_BOX; // 1,000
}
if (mariomode && i == MT_ROSY)
return MT_TOAD; // don't remove on penalty of death
return i;
}