zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-20 18:02:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix vanilla weapon functions passing ammo count to DepleteAmmo

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2023-11-27 20:35:42 -03:00 committed by Christoph Oelckers
parent 429d402dc4
commit 52c878c0d7
10 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wadsrc/static/zscript/actors/doom/doomweapons.zs
View file

@ -31,7 +31,7 @@ extend class StateProvider
Weapon weap = player.ReadyWeapon;
if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, 1))
if (!weap.DepleteAmmo (weap.bAltFire, true))
return;
State flash = weap.FindState('Flash');

2
wadsrc/static/zscript/actors/doom/weaponbfg.zs
View file

@ -107,7 +107,7 @@ extend class StateProvider
if (invoker != weap || stateinfo == null || stateinfo.mStateType != STATE_Psprite) weap = null;
if (weap != null)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, 1))
if (!weap.DepleteAmmo (weap.bAltFire, true))
return;
doesautoaim = weap.bNoAutoaim;

2
wadsrc/static/zscript/actors/doom/weaponchaingun.zs
View file

@ -60,7 +60,7 @@ extend class StateProvider
Weapon weap = player.ReadyWeapon;
if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, 1))
if (!weap.DepleteAmmo (weap.bAltFire, true))
return;
A_StartSound ("weapons/chngun", CHAN_WEAPON);

2
wadsrc/static/zscript/actors/doom/weaponpistol.zs
View file

@ -85,7 +85,7 @@ extend class StateProvider
Weapon weap = player.ReadyWeapon;
if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, 1))
if (!weap.DepleteAmmo (weap.bAltFire, true))
return;
player.SetPsprite(PSP_FLASH, weap.FindState('Flash'), true);

2
wadsrc/static/zscript/actors/doom/weaponplasma.zs
View file

@ -133,7 +133,7 @@ extend class StateProvider
Weapon weap = player.ReadyWeapon;
if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, 1))
if (!weap.DepleteAmmo (weap.bAltFire, true))
return;
State flash = weap.FindState('Flash');

4
wadsrc/static/zscript/actors/doom/weaponrlaunch.zs
View file

@ -152,7 +152,7 @@ extend class StateProvider
Weapon weap = player.ReadyWeapon;
if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, 1))
if (!weap.DepleteAmmo (weap.bAltFire, true))
return;
}
@ -177,7 +177,7 @@ extend class StateProvider
Weapon weap = player.ReadyWeapon;
if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, 1))
if (!weap.DepleteAmmo (weap.bAltFire, true))
return;
}

2
wadsrc/static/zscript/actors/doom/weaponshotgun.zs
View file

@ -66,7 +66,7 @@ extend class StateProvider
Weapon weap = player.ReadyWeapon;
if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, 1))
if (!weap.DepleteAmmo (weap.bAltFire, true))
return;
player.SetPsprite(PSP_FLASH, weap.FindState('Flash'), true);

2
wadsrc/static/zscript/actors/doom/weaponssg.zs
View file

@ -74,7 +74,7 @@ extend class StateProvider
Weapon weap = player.ReadyWeapon;
if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, 2))
if (!weap.DepleteAmmo (weap.bAltFire, true))
return;
player.SetPsprite(PSP_FLASH, weap.FindState('Flash'), true);

10
wadsrc/static/zscript/actors/inventory/weapons.zs
View file

@ -964,15 +964,15 @@ class Weapon : StateProvider
count1 = (Ammo1 != null) ? Ammo1.Amount : 0;
count2 = (Ammo2 != null) ? Ammo2.Amount : 0;
if (ammocount >= 0)
if (bDehAmmo && Ammo1 == null)
{
lAmmoUse1 = 0;
}
else if (ammocount >= 0)
{
lAmmoUse1 = ammocount;
lAmmoUse2 = ammocount;
}
else if (bDehAmmo && Ammo1 == null)
{
lAmmoUse1 = 0;
}
else
{
lAmmoUse1 = AmmoUse1;

2
wadsrc/static/zscript/actors/strife/weaponmauler.zs
View file

@ -62,7 +62,7 @@ class Mauler : StrifeWeapon
Weapon weap = player.ReadyWeapon;
if (weap != null)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, 2))
if (!weap.DepleteAmmo (weap.bAltFire, true))
return;
}