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

Improve emblem sharing conditions

Browse source
This commit is contained in:
Sally Coolatta 2022-10-31 18:09:18 -04:00
parent 29f55471dd
commit c1e641be43
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_inter.c
View file

@ -796,6 +796,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
{
mobj_t *spark = NULL;
boolean prevCollected;
const boolean isServer = ((player - players) == serverplayer);
if (!P_CanPickupEmblem(player, special->health - 1))
{
@ -804,13 +805,13 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
prevCollected = P_EmblemWasCollected(special->health - 1);
if (((player - players) == serverplayer) || shareEmblems)
if (isServer || shareEmblems)
{
serverGamedata->collected[special->health-1] = true;
M_SilentUpdateUnlockablesAndEmblems(serverGamedata);
}
if (P_IsLocalPlayer(player) /*|| shareEmblems*/)
if (P_IsLocalPlayer(player) || (isServer && shareEmblems))
{
clientGamedata->collected[special->health-1] = true;
M_UpdateUnlockablesAndExtraEmblems(clientGamedata);