From be1d3d8a6e10506a91ded05787c2950a909d0c0f Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 30 Dec 2020 08:15:12 +0100 Subject: [PATCH] Fix incorrect instigator being sent by Deep Impact with Omnibusting enabled. --- language.version | 2 +- zscript/swwm_cbt.zsc | 2 +- zscript/swwm_deepdarkimpact.zsc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 959bca60b..5b390f21d 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r712 \cu(Tue 29 Dec 15:41:35 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r713 \cu(Wed 30 Dec 08:15:12 CET 2020)"; diff --git a/zscript/swwm_cbt.zsc b/zscript/swwm_cbt.zsc index a184f421e..b1b4cbcf1 100644 --- a/zscript/swwm_cbt.zsc +++ b/zscript/swwm_cbt.zsc @@ -689,7 +689,7 @@ Class BusterWall : Thinker // not strong enough to bust if ( bust.accdamage < girthitude/300. ) return false; // report bust - if ( Instigator.player ) + if ( Instigator && Instigator.player ) { let s = SWWMStats.Find(Instigator.player); if ( s ) s.busts++; diff --git a/zscript/swwm_deepdarkimpact.zsc b/zscript/swwm_deepdarkimpact.zsc index c38735983..df9a7a23b 100644 --- a/zscript/swwm_deepdarkimpact.zsc +++ b/zscript/swwm_deepdarkimpact.zsc @@ -363,7 +363,7 @@ Class DeepImpact : SWWMWeapon else hitnormal = t.Results.HitSector.ceilingplane.Normal; wnorm += (hitnormal*.2-dir)/max(50.,t.Results.Distance); } - if ( swwm_omnibust ) BusterWall.Bust(t.Results,int(5*(1.-clamp(t.Results.Distance/150.,0.,1.))),target,t.Results.HitVector,t.Results.HitPos.z); + if ( swwm_omnibust ) BusterWall.Bust(t.Results,int(5*(1.-clamp(t.Results.Distance/150.,0.,1.))),self,t.Results.HitVector,t.Results.HitPos.z); } rings += 5; }