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

- Exhumed: Merge grenade pickup code into generic lambda.

Browse source
This commit is contained in:
Mitchell Richters 2023-03-25 10:52:40 +11:00
parent 249d6b1b81
commit 06e97d26aa
1 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
source/games/exhumed/src/playerpickups.cpp
View file

@ -133,7 +133,7 @@ void doPlayerItemPickups(Player* const pPlayer)
StartRegenerate(pPickupActor);
}
};
const auto doPickupWeapon = [=](const int nWeapon, const int nAmount)
const auto doPickupWeapon = [=](const int nWeapon, const int nAmount, const int nSound = kSound72)
{
const int weapFlag = 1 << nWeapon;
@ -154,17 +154,17 @@ void doPlayerItemPickups(Player* const pPlayer)
if (nWeapon == 2)
CheckClip(pPlayer->nPlayer);
if (statBase <= 50)
{
doProcessPickup();
}
else
if (statBase > 50)
{
pPickupActor->spr.cstat = CSTAT_SPRITE_INVISIBLE;
DestroyItemAnim(pPickupActor);
}
else
{
doProcessPickup();
}
doConsoleMessage(StaticSound[kSound72]);
doConsoleMessage(StaticSound[nSound]);
};
const auto doPickupHealth = [=](const int nAmount, int nSound)
{
@ -222,35 +222,16 @@ void doPlayerItemPickups(Player* const pPlayer)
break;
case 3: // Grenade
case 21:
case 21: // May not be grenade, needs confirmation
case 49:
if (AddAmmo(pPlayer->nPlayer, 4, 1))
{
if (!(pPlayer->nPlayerWeapons & 0x10))
{
pPlayer->nPlayerWeapons |= 0x10;
SetNewWeaponIfBetter(pPlayer->nPlayer, 4);
}
if (statBase == 55)
{
pPickupActor->spr.cstat = CSTAT_SPRITE_INVISIBLE;
DestroyItemAnim(pPickupActor);
}
else
{
doProcessPickup();
}
doConsoleMessage(StaticSound[kSoundAmmoPickup]);
}
doPickupWeapon(4, 1, kSoundAmmoPickup);
break;
case 4: // Pickable item
case 9: // Pickable item
case 10: // Reserved
case 18:
case 25:
case 25: // Check whether is grenade or not as it matches sequence for weapons below
case 28:
case 29:
case 30: