Merge branch 'eggshield-laser-fix' into 'next'

Eggshield laser fix

Fix for http://mb.srb2.org/showthread.php?t=42250

See merge request !152
This commit is contained in:
Monster Iestyn 2017-01-07 14:33:27 -05:00
commit c93101aa74

View file

@ -5342,6 +5342,10 @@ void T_LaserFlash(laserthink_t *flash)
&& thing->flags & MF_BOSS) && thing->flags & MF_BOSS)
continue; // Don't hurt bosses continue; // Don't hurt bosses
// Don't endlessly kill egg guard shields (or anything else for that matter)
if (thing->health <= 0)
continue;
top = P_GetSpecialTopZ(thing, sourcesec, sector); top = P_GetSpecialTopZ(thing, sourcesec, sector);
bottom = P_GetSpecialBottomZ(thing, sourcesec, sector); bottom = P_GetSpecialBottomZ(thing, sourcesec, sector);