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 2d51dce26d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r788 \cu(Fri 10 Mar 20:36:36 CET 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r788 \cu(2023-03-10 20:36:36)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r789 \cu(Sat 11 Mar 01:06:32 CET 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r789 \cu(2023-03-11 01:06:32)\c-";

2
zscript/weapons/swwm_tastytreat.zsc
View file

@ -554,7 +554,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");