OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix typo in A_Headpat that would cause a crash.

Browse source
This commit is contained in:
Mari the Deer 2020-10-30 13:21:11 +01:00
commit bb061ee98a
8 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/swwm_inter.zsc
View file

@ -115,7 +115,11 @@ Class SWWMStatScreen : StatusScreen abstract
Array<Int> ents;
ents.Clear();
for ( int i=1; i<=maxtip; i++ )
{
// skip DLC tips for now
if ( (i >= 61) && (i <= 68) ) continue;
ents.Push(i);
}
if ( pdata.lasttip.Size() >= maxtip )
{
// exclude last one, start over

2
zscript/swwm_player.zsc
View file

@ -3149,7 +3149,7 @@ Class SWWMGesture : SWWMWeapon
}
if ( pt.target.GiveBody(healamt,pt.target.GetSpawnHealth()) )
{
SWWMScoreObj.Spawn(healamt,pt.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+target.Height/2),Font.CR_BLUE);
SWWMScoreObj.Spawn(healamt,pt.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+pt.target.Height/2),Font.CR_BLUE);
SWWMHandler.DoFlash(pt.target,Color(32,224,128,255),10);
}
}

11
zscript/swwm_utility.zsc
View file

@ -750,7 +750,8 @@ Class SWWMUtility
// complete spherical and more accurate replacement of A_Explode
// 100% free of the buggery GZDoom's own splash damage has
static play void DoExplosion( Actor Source, double Damage, double MomentumTransfer, double ExplosionRadius, double FullDamageRadius = 0., int flags = 0, Name DamageType = '', Actor ignoreme = null )
// returns the number of shootables hit/killed
static play int, int DoExplosion( Actor Source, double Damage, double MomentumTransfer, double ExplosionRadius, double FullDamageRadius = 0., int flags = 0, Name DamageType = '', Actor ignoreme = null )
{
// debug, display radius sphere
if ( swwm_debugblast )
@ -769,6 +770,7 @@ Class SWWMUtility
double brange = 1./(ExplosionRadius-FullDamageRadius);
Actor Instigator = (flags&DE_NOTMISSILE)?Source:Source.target;
BlockThingsIterator bi = BlockThingsIterator.Create(Source,ExplosionRadius*2); // test with doubled radius, just to be sure
int nhit = 0, nkill = 0;
while ( bi.Next() )
{
Actor a = bi.Thing;
@ -815,11 +817,14 @@ Class SWWMUtility
if ( (flags&DE_BLAST) && a.bCANBLAST && !a.bDONTBLAST ) a.bBLASTED = true;
}
// hit it
nhit++;
int dmg = int(Damage*damagescale);
if ( dmg <= 0 ) continue; // no harm
int ndmg = a.DamageMobj(Source,Instigator,dmg,(DamageType=='')?Source.DamageType:DamageType,DMG_EXPLOSION,atan2(-dir.y,-dir.x));
if ( !(flags&DE_NOBLEED) ) a.TraceBleed((ndmg>0)?ndmg:dmg,Source);
if ( a && !(flags&DE_NOBLEED) ) a.TraceBleed((ndmg>0)?ndmg:dmg,Source);
if ( !a || (a.Health <= 0) ) nkill++;
}
return nhit, nkill;
}
static play bool InPlayerFOV( PlayerInfo p, Actor a, double maxdist = 0. )
@ -843,7 +848,7 @@ Class SWWMUtility
{
if ( (p != -1) && (p == consoleplayer) )
{
Console.Printf("\cfSORRY NOTHING\c-");
Console.Printf("\cxSORRY NOTHING\c-");
S_StartSound("misc/trombone",CHAN_VOICE,CHANF_UI);
}
return true;