From 898e2900b328cb5989d8a482b84ea319c7ab4503 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@users.noreply.github.com>
Date: Sun, 11 Dec 2016 12:42:55 +0100
Subject: [PATCH] - more fixes in blastradius.txt.

---
 wadsrc/static/zscript/hexen/blastradius.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wadsrc/static/zscript/hexen/blastradius.txt b/wadsrc/static/zscript/hexen/blastradius.txt
index becc9a9bc..7374a4523 100644
--- a/wadsrc/static/zscript/hexen/blastradius.txt
+++ b/wadsrc/static/zscript/hexen/blastradius.txt
@@ -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")
 	{
 
-		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;
 			if (weapon != null && !weapon.DepleteAmmo(weapon.bAltFire))
@@ -116,7 +116,7 @@ extend class Actor
 
 		if (!(blastflags & BF_DONTWARN))
 		{
-			NoiseAlert (self);
+			SoundAlert (self);
 		}
 		ThinkerIterator it = ThinkerIterator.Create("Actor");
 		Actor mo;