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

- Exhumed: Use lookup table for weapon pickups in doPlayerItemPickups().

Browse source
This commit is contained in:
Mitchell Richters 2023-03-25 08:39:13 +11:00
parent be9ece4afc
commit e766c29fd5
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,6 +97,7 @@ void doPlayerItemPickups(Player* const pPlayer)
if (itemtype <= 54) if (itemtype <= 54)
{ {
static constexpr int itemArray[] = {kItemHeart, kItemInvincibility, kItemDoubleDamage, kItemInvisibility, kItemTorch, kItemMask}; static constexpr int itemArray[] = {kItemHeart, kItemInvincibility, kItemDoubleDamage, kItemInvisibility, kItemTorch, kItemMask};
static constexpr int weapArray[] = {6, 24, 100, 20, 2};
static constexpr int ammoArray[] = {1, 3, 2}; static constexpr int ammoArray[] = {1, 3, 2};
const auto doConsoleMessage = [=](const int nSound = -1, const int tintRed = 0, const int tintGreen = 16) const auto doConsoleMessage = [=](const int nSound = -1, const int tintRed = 0, const int tintGreen = 16)
@ -329,28 +330,19 @@ void doPlayerItemPickups(Player* const pPlayer)
case 22: // .357 Magnum Revolver case 22: // .357 Magnum Revolver
case 46: case 46:
doPickupWeapon(1, 6);
break;
case 23: // M - 60 Machine Gun case 23: // M - 60 Machine Gun
case 47: case 47:
doPickupWeapon(2, 24);
break;
case 24: // Flame Thrower case 24: // Flame Thrower
case 48: case 48:
doPickupWeapon(3, 100);
break;
case 26: // Cobra Staff case 26: // Cobra Staff
case 50: case 50:
doPickupWeapon(5, 20);
break;
case 27: // Eye of Ra Gauntlet case 27: // Eye of Ra Gauntlet
case 51: case 51:
doPickupWeapon(6, 2); {
const int index = itemtype - 24 * (itemtype > 40) - 22;
doPickupWeapon(index + 1, weapArray[index]);
break; break;
}
case 31: // Cobra staff ammo case 31: // Cobra staff ammo
if (AddAmmo(pPlayer->nPlayer, 5, 1)) if (AddAmmo(pPlayer->nPlayer, 5, 1))