OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Hotfix: Pulsegun clipcount is ignored while firing.

Browse source
This commit is contained in:
Marisa the Magician 2019-09-28 23:48:57 +02:00
commit c5be5ae0c7
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zscript/pulsegun.zsc
View file

@ -539,7 +539,7 @@ Class PulseGun : UTWeapon
{ {
Weapon weap = Weapon(invoker); Weapon weap = Weapon(invoker);
if ( !weap ) return; if ( !weap ) return;
if ( (weap.Ammo1.Amount <= 0) || !(player.cmd.buttons&BT_ALTATTACK) ) if ( (weap.Ammo1.Amount <= 0) || !(player.cmd.buttons&BT_ALTATTACK) || (flak_pulsereload && (invoker.clipcount <= 0)) )
{ {
player.SetPSprite(PSP_WEAPON,ResolveState("AltRelease")); player.SetPSprite(PSP_WEAPON,ResolveState("AltRelease"));
return; return;
@ -583,7 +583,7 @@ Class PulseGun : UTWeapon
{ {
Weapon weap = Weapon(invoker); Weapon weap = Weapon(invoker);
if ( !weap || !player ) return; if ( !weap || !player ) return;
if ( (invoker.clipcount <= 0) || (weap.Ammo1.Amount <= 0) ) if ( (flak_pulsereload && (invoker.clipcount <= 0)) || (weap.Ammo1.Amount <= 0) )
return; return;
if ( player.cmd.buttons&BT_ALTATTACK ) if ( player.cmd.buttons&BT_ALTATTACK )
{ {
@ -600,7 +600,7 @@ Class PulseGun : UTWeapon
{ {
Weapon weap = Weapon(invoker); Weapon weap = Weapon(invoker);
if ( !weap ) return; if ( !weap ) return;
if ( (weap.Ammo1.Amount <= 0) || !(player.cmd.buttons&BT_ATTACK) ) if ( (weap.Ammo1.Amount <= 0) || !(player.cmd.buttons&BT_ATTACK) || (flak_pulsereload && (invoker.clipcount <= 0)) )
{ {
player.SetPSprite(PSP_WEAPON,ResolveState("Release")); player.SetPSprite(PSP_WEAPON,ResolveState("Release"));
return; return;