OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix Candy Gun reselecting if dead mid-throw.

Browse source
This commit is contained in:
Mari the Deer 2023-03-11 01:06:32 +01:00
commit 70c6af7dfa
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zscript/weapons/swwm_tastytreat.zsc
View file

@ -559,7 +559,7 @@ Class CandyGun : SWWMWeapon
{
invoker.bNODEATHDESELECT = false;
if ( (invoker.Amount > 0) && (invoker.Ammo2.Amount >= 0) ) A_LoadMag();
if ( invoker.clipcount > 0 )
if ( (invoker.clipcount > 0) && (Health > 0) )
{
invoker.PlayUpSound(self);
return ResolveState("Select");