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: Remove call to doConsoleMessage() from default lambda so what's going on is clearer.

Browse source
This commit is contained in:
Mitchell Richters 2023-03-24 23:55:03 +11:00
parent 24b21345b1
commit 84223b6b04
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,8 +133,6 @@ void doPlayerItemPickups(Player* const pPlayer)
{ {
StartRegenerate(pPickupActor); StartRegenerate(pPickupActor);
} }
doConsoleMessage();
}; };
const auto doPickupWeapon = [&]() const auto doPickupWeapon = [&]()
{ {
@ -166,8 +164,9 @@ void doPlayerItemPickups(Player* const pPlayer)
{ {
pPickupActor->spr.cstat = CSTAT_SPRITE_INVISIBLE; pPickupActor->spr.cstat = CSTAT_SPRITE_INVISIBLE;
DestroyItemAnim(pPickupActor); DestroyItemAnim(pPickupActor);
doConsoleMessage();
} }
doConsoleMessage();
}; };
const auto doPickupHealth = [&]() const auto doPickupHealth = [&]()
{ {
@ -193,7 +192,6 @@ void doPlayerItemPickups(Player* const pPlayer)
pPickupActor->spr.hitag = 0; pPickupActor->spr.hitag = 0;
pPickupActor->spr.picnum++; pPickupActor->spr.picnum++;
ChangeActorStat(pPickupActor, 0); ChangeActorStat(pPickupActor, 0);
doConsoleMessage();
} }
else else
{ {
@ -210,6 +208,8 @@ void doPlayerItemPickups(Player* const pPlayer)
doProcessPickup(); doProcessPickup();
} }
doConsoleMessage();
} }
}; };
@ -220,6 +220,7 @@ void doPlayerItemPickups(Player* const pPlayer)
{ {
nSound = StaticSound[kSoundAmmoPickup]; nSound = StaticSound[kSoundAmmoPickup];
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -228,6 +229,7 @@ void doPlayerItemPickups(Player* const pPlayer)
{ {
nSound = StaticSound[kSoundAmmoPickup]; nSound = StaticSound[kSoundAmmoPickup];
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -237,6 +239,7 @@ void doPlayerItemPickups(Player* const pPlayer)
nSound = StaticSound[kSoundAmmoPickup]; nSound = StaticSound[kSoundAmmoPickup];
CheckClip(pPlayer->nPlayer); CheckClip(pPlayer->nPlayer);
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -257,12 +260,13 @@ void doPlayerItemPickups(Player* const pPlayer)
{ {
pPickupActor->spr.cstat = CSTAT_SPRITE_INVISIBLE; pPickupActor->spr.cstat = CSTAT_SPRITE_INVISIBLE;
DestroyItemAnim(pPickupActor); DestroyItemAnim(pPickupActor);
doConsoleMessage();
} }
else else
{ {
doProcessPickup(); doProcessPickup();
} }
doConsoleMessage();
} }
break; break;
@ -283,11 +287,13 @@ void doPlayerItemPickups(Player* const pPlayer)
case 45: case 45:
case 52: case 52:
doProcessPickup(); doProcessPickup();
doConsoleMessage();
break; break;
case 5: // Map case 5: // Map
GrabMap(); GrabMap();
doProcessPickup(); doProcessPickup();
doConsoleMessage();
break; break;
case 6: // Berry Twig case 6: // Berry Twig
@ -331,6 +337,7 @@ void doPlayerItemPickups(Player* const pPlayer)
if (GrabItem(pPlayer->nPlayer, kItemHeart)) if (GrabItem(pPlayer->nPlayer, kItemHeart))
{ {
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -338,6 +345,7 @@ void doPlayerItemPickups(Player* const pPlayer)
if (GrabItem(pPlayer->nPlayer, kItemInvincibility)) if (GrabItem(pPlayer->nPlayer, kItemInvincibility))
{ {
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -345,6 +353,7 @@ void doPlayerItemPickups(Player* const pPlayer)
if (GrabItem(pPlayer->nPlayer, kItemDoubleDamage)) if (GrabItem(pPlayer->nPlayer, kItemDoubleDamage))
{ {
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -352,6 +361,7 @@ void doPlayerItemPickups(Player* const pPlayer)
if (GrabItem(pPlayer->nPlayer, kItemInvisibility)) if (GrabItem(pPlayer->nPlayer, kItemInvisibility))
{ {
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -359,6 +369,7 @@ void doPlayerItemPickups(Player* const pPlayer)
if (GrabItem(pPlayer->nPlayer, kItemTorch)) if (GrabItem(pPlayer->nPlayer, kItemTorch))
{ {
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -366,6 +377,7 @@ void doPlayerItemPickups(Player* const pPlayer)
if (GrabItem(pPlayer->nPlayer, kItemMask)) if (GrabItem(pPlayer->nPlayer, kItemMask))
{ {
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -376,6 +388,7 @@ void doPlayerItemPickups(Player* const pPlayer)
tintGreen = 32; tintGreen = 32;
tintRed = 32; tintRed = 32;
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -425,6 +438,7 @@ void doPlayerItemPickups(Player* const pPlayer)
{ {
nSound = StaticSound[kSoundAmmoPickup]; nSound = StaticSound[kSoundAmmoPickup];
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -433,6 +447,7 @@ void doPlayerItemPickups(Player* const pPlayer)
{ {
nSound = StaticSound[kSoundAmmoPickup]; nSound = StaticSound[kSoundAmmoPickup];
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;
@ -447,15 +462,8 @@ void doPlayerItemPickups(Player* const pPlayer)
if (!(pPlayer->keys & keybit)) if (!(pPlayer->keys & keybit))
{ {
pPlayer->keys |= keybit; pPlayer->keys |= keybit;
doProcessPickup();
if (nTotalPlayers > 1) doConsoleMessage();
{
doConsoleMessage();
}
else
{
doProcessPickup();
}
} }
break; break;
} }
@ -474,6 +482,7 @@ void doPlayerItemPickups(Player* const pPlayer)
} }
doProcessPickup(); doProcessPickup();
doConsoleMessage();
} }
break; break;