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: Final switch case statement cleanups in doPlayerItemPickups().

Browse source
This commit is contained in:
Mitchell Richters 2023-03-25 00:08:53 +11:00
parent 83c7dfa7c9
commit 40033c3a9d
1 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -320,70 +320,55 @@ void doPlayerItemPickups(Player* const pPlayer)
break;
case 31: // Cobra staff ammo
{
if (AddAmmo(pPlayer->nPlayer, 5, 1)) {
if (AddAmmo(pPlayer->nPlayer, 5, 1))
{
nSound = StaticSound[kSoundAmmoPickup];
pickFlag |= kPickupDefaults;
}
break;
}
case 32: // Raw Energy
{
if (AddAmmo(pPlayer->nPlayer, 6, pPickupActor->spr.hitag)) {
if (AddAmmo(pPlayer->nPlayer, 6, pPickupActor->spr.hitag))
{
nSound = StaticSound[kSoundAmmoPickup];
pickFlag |= kPickupDefaults;
}
break;
}
case 39: // Power key
case 40: // Time key
case 41: // War key
case 42: // Earth key
{
int keybit = 4096 << (itemtype - 39);
const int keybit = 4096 << (itemtype - 39);
nSound = -1;
if (!(pPlayer->keys & keybit))
{
pPlayer->keys |= keybit;
if (nTotalPlayers > 1)
{
pickFlag |= kPickupOnConsole;
}
else
{
pickFlag |= kPickupDefaults;
}
pickFlag |= (nTotalPlayers > 1) ? kPickupOnConsole : kPickupDefaults;
}
break;
}
case 43: // Magical Essence
case 44: // ?
{
if (pPlayer->nMagic >= 1000) {
break;
if (pPlayer->nMagic < 1000)
{
nSound = StaticSound[kSoundMana1];
pPlayer->nMagic += 100;
if (pPlayer->nMagic >= 1000)
{
pPlayer->nMagic = 1000;
}
pickFlag |= kPickupDefaults;
}
nSound = StaticSound[kSoundMana1];
pPlayer->nMagic += 100;
if (pPlayer->nMagic >= 1000) {
pPlayer->nMagic = 1000;
}
pickFlag |= kPickupDefaults;
}
break;
case 53: // Scarab (Checkpoint)
{
if (nLocalPlayer == pPlayer->nPlayer)
{
pPickupActor->nIndex2++;
@ -395,10 +380,8 @@ void doPlayerItemPickups(Player* const pPlayer)
SetSavePoint(pPlayer->nPlayer, pPlayerActor->spr.pos, pPlayerActor->sector(), pPlayerActor->spr.Angles.Yaw);
break;
}
case 54: // Golden Sarcophagus (End Level)
{
if (!bInDemo)
{
LevelFinished();
@ -408,7 +391,6 @@ void doPlayerItemPickups(Player* const pPlayer)
DeleteActor(pPickupActor);
break;
}
}
if (pickFlag & kPickupHealth)
{