From 79ef78e2b5b049914e94a4d5527468413ae69706 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 14 Sep 2023 22:32:20 +0200
Subject: [PATCH] - fix ammo consumption of powered up Phoenix Rod.

---
 wadsrc/static/zscript/actors/heretic/weaponphoenix.zs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wadsrc/static/zscript/actors/heretic/weaponphoenix.zs b/wadsrc/static/zscript/actors/heretic/weaponphoenix.zs
index 3300c43d35..884db86f82 100644
--- a/wadsrc/static/zscript/actors/heretic/weaponphoenix.zs
+++ b/wadsrc/static/zscript/actors/heretic/weaponphoenix.zs
@@ -93,7 +93,7 @@ class PhoenixRodPowered : PhoenixRod
 
 	override void EndPowerup ()
 	{
-		DepleteAmmo (bAltFire);
+		if (FlameCount > 0) DepleteAmmo (bAltFire);
 		Owner.player.refire = 0;
 		Owner.A_StopSound (CHAN_WEAPON);
 		Owner.player.ReadyWeapon = SisterWeapon;
@@ -178,9 +178,10 @@ class PhoenixRodPowered : PhoenixRod
 			return;
 		}
 		A_StopSound (CHAN_WEAPON);
-		Weapon weapon = player.ReadyWeapon;
+		PhoenixRodPowered weapon = PhoenixRodPowered(player.ReadyWeapon);
 		if (weapon != null)
 		{
+			weapon.FlameCount = 0;
 			weapon.DepleteAmmo (weapon.bAltFire);
 		}
 	}