stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-23 19:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Emblems disappear on collection again, only for SP

Browse source
This commit is contained in:
Sally Coolatta 2022-10-31 18:46:47 -04:00
parent 645dd7d662
commit cf228757a1
1 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/p_inter.c
View file

@ -794,9 +794,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
// Secret emblem thingy
case MT_EMBLEM:
{
mobj_t *spark = NULL;
boolean prevCollected;
const boolean isServer = ((player - players) == serverplayer);
const boolean toucherIsServer = ((player - players) == serverplayer);
const boolean consoleIsServer = (consoleplayer == serverplayer);
boolean prevCollected = false;
if ((special->flags2 & MF2_NIGHTSPULL)
&& (toucher == special->tracer))
@ -816,31 +816,48 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
prevCollected = P_EmblemWasCollected(special->health - 1);
if (isServer || shareEmblems)
if (toucherIsServer || shareEmblems)
{
serverGamedata->collected[special->health-1] = true;
M_SilentUpdateUnlockablesAndEmblems(serverGamedata);
}
if (P_IsLocalPlayer(player) || (isServer && shareEmblems))
if (P_IsLocalPlayer(player) || (consoleIsServer && shareEmblems))
{
clientGamedata->collected[special->health-1] = true;
M_UpdateUnlockablesAndExtraEmblems(clientGamedata);
G_SaveGameData(clientGamedata);
}
// This always spawns the object to prevent mobjnum issues,
// but makes the effect invisible to whoever it doesn't matter to.
spark = P_SpawnMobjFromMobj(special, 0, 0, 0, MT_SPARK);
if (prevCollected == false && P_EmblemWasCollected(special->health - 1) == true)
if (netgame)
{
S_StartSound((shareEmblems ? NULL : special), special->info->deathsound);
// This always spawns the object to prevent mobjnum issues,
// but makes the effect invisible to whoever it doesn't matter to.
mobj_t *spark = P_SpawnMobjFromMobj(special, 0, 0, 0, MT_SPARK);
if (prevCollected == false && P_EmblemWasCollected(special->health - 1) == true)
{
// Play the sound if it was collected.
S_StartSound((shareEmblems ? NULL : special), special->info->deathsound);
}
else
{
// We didn't collect it, make it invisible to us.
spark->flags2 |= MF2_DONTDRAW;
}
return;
}
else
{
spark->flags2 |= MF2_DONTDRAW;
if (prevCollected == false && P_EmblemWasCollected(special->health - 1) == true)
{
// Disappear when collecting for local games.
break;
}
return;
}
return;
}
// CTF Flags