zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- more fixes in blastradius.txt.

This commit is contained in:
Christoph Oelckers 2016-12-11 12:42:55 +01:00
parent 2b24fee53d
commit 898e2900b3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wadsrc/static/zscript/hexen/blastradius.txt
View File

@ -103,7 +103,7 @@ extend class Actor
action void A_Blast(int blastflags = 0, double strength = 255, double radius = 255, double speed = 20, class<Actor> blasteffect = "BlastEffect", sound blastsound = "BlastRadius") action void A_Blast(int blastflags = 0, double strength = 255, double radius = 255, double speed = 20, class<Actor> blasteffect = "BlastEffect", sound blastsound = "BlastRadius")
{ {
if (player && (blastflags & BF_USEAMMO) && invoker == weapon && stateinfo != null && stateinfo.mStateType == STATE_Psprite) if (player && (blastflags & BF_USEAMMO) && invoker == player.ReadyWeapon && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
{ {
Weapon weapon = player.ReadyWeapon; Weapon weapon = player.ReadyWeapon;
if (weapon != null && !weapon.DepleteAmmo(weapon.bAltFire)) if (weapon != null && !weapon.DepleteAmmo(weapon.bAltFire))
@ -116,7 +116,7 @@ extend class Actor
if (!(blastflags & BF_DONTWARN)) if (!(blastflags & BF_DONTWARN))
{ {
NoiseAlert (self); SoundAlert (self);
} }
ThinkerIterator it = ThinkerIterator.Create("Actor"); ThinkerIterator it = ThinkerIterator.Create("Actor");
Actor mo; Actor mo;