fix: reload when adding secondary ammo

This commit is contained in:
GenZmeY 2020-10-13 10:31:49 +03:00
parent 9a15562e91
commit 1f99accda4

View File

@ -15,6 +15,7 @@ function Timer()
{ {
local KFWeapon W; local KFWeapon W;
local byte i; local byte i;
local int ExtraAmmo;
if( PawnOwner==None || PawnOwner.Health<=0 || PawnOwner.InvManager==None ) if( PawnOwner==None || PawnOwner.Health<=0 || PawnOwner.InvManager==None )
Destroy(); Destroy();
@ -24,9 +25,17 @@ function Timer()
{ {
for( i=0; i<2; ++i ) for( i=0; i<2; ++i )
{ {
if( W.SpareAmmoCount[i]<W.SpareAmmoCapacity[i] ) if( W.SpareAmmoCount[i] < W.SpareAmmoCapacity[i] )
{ {
W.SpareAmmoCount[i] = Min(W.SpareAmmoCount[i]+FMax(float(W.SpareAmmoCapacity[i])*RegCount,1.f),W.SpareAmmoCapacity[i]); ExtraAmmo = Min(FMax(float(W.SpareAmmoCapacity[i])*RegCount,1.f),W.SpareAmmoCapacity[i]);
if ( i==0 )
{
W.AddAmmo(ExtraAmmo);
}
else
{
W.AddSecondaryAmmo(ExtraAmmo);
}
W.bNetDirty = true; W.bNetDirty = true;
} }
} }
@ -36,4 +45,4 @@ function Timer()
defaultproperties defaultproperties
{ {
} }