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: Use lookup table for some weapon types in doPlayerItemPickups().

Browse source
This commit is contained in:
Mitchell Richters 2023-03-25 07:42:10 +11:00
parent 1013d41f89
commit be9ece4afc
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,6 +97,7 @@ void doPlayerItemPickups(Player* const pPlayer)
if (itemtype <= 54)
{
static constexpr int itemArray[] = {kItemHeart, kItemInvincibility, kItemDoubleDamage, kItemInvisibility, kItemTorch, kItemMask};
static constexpr int ammoArray[] = {1, 3, 2};
const auto doConsoleMessage = [=](const int nSound = -1, const int tintRed = 0, const int tintGreen = 16)
{
@ -212,25 +213,11 @@ void doPlayerItemPickups(Player* const pPlayer)
switch (itemtype)
{
case 0: // Speed Loader
if (AddAmmo(pPlayer->nPlayer, 1, pPickupActor->spr.hitag))
{
doProcessPickup();
doConsoleMessage(StaticSound[kSoundAmmoPickup]);
}
break;
case 1: // Fuel Canister
if (AddAmmo(pPlayer->nPlayer, 3, pPickupActor->spr.hitag))
{
doProcessPickup();
doConsoleMessage(StaticSound[kSoundAmmoPickup]);
}
break;
case 2: // M - 60 Ammo Belt
if (AddAmmo(pPlayer->nPlayer, 2, pPickupActor->spr.hitag))
if (AddAmmo(pPlayer->nPlayer, ammoArray[itemtype], pPickupActor->spr.hitag))
{
CheckClip(pPlayer->nPlayer);
if (itemtype == 2) CheckClip(pPlayer->nPlayer);
doProcessPickup();
doConsoleMessage(StaticSound[kSoundAmmoPickup]);
}