OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix incorrect instigator being sent by Deep Impact with Omnibusting enabled.

Browse source
This commit is contained in:
Mari the Deer 2020-12-30 08:15:12 +01:00
commit be1d3d8a6e
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
language.version
View file

@ -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)";

2
zscript/swwm_cbt.zsc
View file

@ -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++;

2
zscript/swwm_deepdarkimpact.zsc
View file

@ -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;
}