OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Another fix to something that can fail catastrophically if monsters spontaneously cease to exist in the middle of a DamageMobj call.

Browse source 
Small adjustment to translocator module (hitbox uses master rather than target pointer), for safety.
Removed some leftover sounds.
This commit is contained in:
Marisa the Magician 2019-08-19 20:19:26 +02:00
commit ada67df8c0
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/utcommon.zsc
View file

@ -1974,7 +1974,7 @@ Class ShredCorpseHitbox : Actor
override void Tick()
{
Super.Tick();
if ( (!(target is 'UTPlayer') && !flak_corpsedamage) || !target || (target.Health > 0) || target.InStateSequence(target.CurState,target.FindState("XDeath")) )
if ( (!(target is 'UTPlayer') && !flak_corpsedamage) || !target || (target.Health > 0) || target.InStateSequence(target.CurState,target.FindState("XDeath",true)) )
{
Destroy();
return;
@ -1995,6 +1995,8 @@ Class ShredCorpseHitbox : Actor
}
override int DamageMobj( Actor inflictor, Actor source, int damage, Name mod, int flags, double angle )
{
// somehow target can spontaneously stop existing while this is happening
if ( !target ) return 0;
if ( (target is 'UTPlayer') && (mod == 'Zapped') && (target.sprite == target.GetSpriteIndex('PLD9')) )
{
// keep the zapping action on