Merge branch 'emblemhealth' into 'next'

Fix #805

Closes #805

See merge request STJr/SRB2!1757
This commit is contained in:
sphere 2022-03-06 15:44:50 +00:00
commit 8e6174ab2d

View file

@ -738,12 +738,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
// Secret emblem thingy
case MT_EMBLEM:
{
if (demoplayback || (player->bot && player->bot != BOT_MPAI))
if (demoplayback || (player->bot && player->bot != BOT_MPAI) || special->health > MAXEMBLEMS)
return;
emblemlocations[special->health-1].collected = true;
M_UpdateUnlockablesAndExtraEmblems();
G_SaveGameData();
break;
}