Skip to content
Snippets Groups Projects
Commit fe79717d authored by Lactozilla's avatar Lactozilla :speech_balloon:
Browse files

Merge branch 'firefire' into 'next'

Hide shield overlays and not just the shield while shieldscale zero (resolves #1340)

Closes #1340

See merge request STJr/SRB2!2581
parents 914b50dc 7168aa73
No related branches found
No related tags found
No related merge requests found
...@@ -6773,6 +6773,12 @@ void P_RunOverlays(void) ...@@ -6773,6 +6773,12 @@ void P_RunOverlays(void)
else else
zoffs = 0; zoffs = 0;
// hide the overlay as well if we're part of a hidden shield
if ((mo->target->flags2 & (MF2_JUSTATTACKED|MF2_DONTDRAW)) == (MF2_JUSTATTACKED|MF2_DONTDRAW))
mo->flags2 |= (MF2_DONTDRAW|MF2_JUSTATTACKED);
else if (mo->flags2 & MF2_JUSTATTACKED)
mo->flags2 &= ~(MF2_DONTDRAW|MF2_JUSTATTACKED);
P_UnsetThingPosition(mo); P_UnsetThingPosition(mo);
mo->x = mo->target->x; mo->x = mo->target->x;
mo->y = mo->target->y; mo->y = mo->target->y;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment