zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-22 12:11:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

hardcode gAmmoItemData[0].count in 4 places.

Browse source 
This will have to be done differently later so simplify matters for now by removing the dependency.
This commit is contained in:
Christoph Oelckers 2023-10-03 22:50:02 +02:00
parent 6eda7d930e
commit e8eb558025
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/blood/src/weapon.cpp
View file

@ -1206,7 +1206,7 @@ void ThrowCan(int, DBloodPlayer* pPlayer)
spawned->spr.shade = -128;
evPostActor(spawned, pPlayer->fuseTime, kCmdOn, pPlayer->GetActor());
spawned->xspr.Impact = 1;
UseAmmo(pPlayer, 6, gAmmoItemData[0].count);
UseAmmo(pPlayer, 6, 480/*gAmmoItemData[0].count*/);
pPlayer->throwPower = 0;
}
}
@ -1224,7 +1224,7 @@ void DropCan(int, DBloodPlayer* pPlayer)
if (spawned)
{
evPostActor(spawned, pPlayer->fuseTime, kCmdOn, pPlayer->GetActor());
UseAmmo(pPlayer, 6, gAmmoItemData[0].count);
UseAmmo(pPlayer, 6, 480/*gAmmoItemData[0].count*/);
}
}
@ -1241,7 +1241,7 @@ void ExplodeCan(int, DBloodPlayer* pPlayer)
if (spawned)
{
evPostActor(spawned, 0, kCmdOn, pPlayer->GetActor());
UseAmmo(pPlayer, 6, gAmmoItemData[0].count);
UseAmmo(pPlayer, 6, 480/*gAmmoItemData[0].count*/);
StartQAV(pPlayer, kQAVCANBOOM);
pPlayer->curWeapon = kWeapNone;
pPlayer->throwPower = 0;
@ -1822,7 +1822,7 @@ void DropVoodoo(int, DBloodPlayer* pPlayer)
{
spawned->xspr.data1 = pPlayer->ammoCount[9];
evPostActor(spawned, 90, kCallbackDropVoodoo);
UseAmmo(pPlayer, 6, gAmmoItemData[0].count);
UseAmmo(pPlayer, 6, 480/*gAmmoItemData[0].count*/);
UseAmmo(pPlayer, 9, pPlayer->ammoCount[9]);
pPlayer->hasWeapon[kWeapVoodooDoll] = 0;
}