thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MT_EMBLEM: Rework grabbable conditions, so you pass through collected ones in both offline and online for consistency

Browse source
This commit is contained in:
toaster 2023-08-19 22:11:56 +01:00
parent d19e98beb8
commit 3036eaf35d
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/p_inter.c
View file

@ -596,26 +596,22 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
// Secret emblem thingy // Secret emblem thingy
case MT_EMBLEM: case MT_EMBLEM:
{ {
boolean gotcollected = false;
if (!P_CanPickupEmblem(player, special->health - 1)) if (!P_CanPickupEmblem(player, special->health - 1))
return; return;
if (P_IsLocalPlayer(player) && !gamedata->collected[special->health-1]) if (P_IsLocalPlayer(player))
{ {
gamedata->collected[special->health-1] = gotcollected = true; if (!gamedata->collected[special->health-1])
if (!M_UpdateUnlockablesAndExtraEmblems(true, true)) {
S_StartSound(NULL, sfx_ncitem); gamedata->collected[special->health-1] = true;
gamedata->deferredsave = true; if (!M_UpdateUnlockablesAndExtraEmblems(true, true))
S_StartSound(NULL, sfx_ncitem);
gamedata->deferredsave = true;
}
} }
if (netgame) // Don't delete the object, just fade it.
{ return;
// Don't delete the object in netgames, just fade it.
return;
}
break;
} }
// CTF Flags // CTF Flags