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

- fix ammo consumption of powered up Phoenix Rod.

This commit is contained in:
Christoph Oelckers 2023-09-14 22:32:20 +02:00
parent 727c57583b
commit 79ef78e2b5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wadsrc/static/zscript/actors/heretic/weaponphoenix.zs
View File

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