stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-24 13:21:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'emblemhealth' into 'next'

Browse source 
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
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_inter.c
View file

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