mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-24 13:21:20 +00:00
Merge branch 'emblemhealth' into 'next'
Fix #805 Closes #805 See merge request STJr/SRB2!1757
This commit is contained in:
commit
8e6174ab2d
1 changed files with 1 additions and 2 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue