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: Pass tint values through to lambdas as args as well.

Browse source
This commit is contained in:
Mitchell Richters 2023-03-25 00:07:09 +11:00
parent da47369582
commit 72af290502
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,10 +96,7 @@ void doPlayerItemPickups(Player* const pPlayer)
if (itemtype <= 54)
{
int tintRed = 0;
int tintGreen = 16;
const auto doConsoleMessage = [&](const int nSound = -1)
const auto doConsoleMessage = [=](const int nSound = -1, const int tintRed = 0, const int tintGreen = 16)
{
if (pPlayer->nPlayer == nLocalPlayer)
{
@ -112,7 +109,7 @@ void doPlayerItemPickups(Player* const pPlayer)
TintPalette(tintRed * 4, tintGreen * 4, 0);
}
};
const auto doProcessPickup = [&]()
const auto doProcessPickup = [=]()
{
if (!mplevel || (statBase >= 25 && (statBase <= 25 || statBase == 50)))
{
@ -131,7 +128,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 weapFlag = 1 << nWeapon;
@ -164,10 +161,12 @@ void doPlayerItemPickups(Player* const pPlayer)
doConsoleMessage(StaticSound[kSound72]);
};
const auto doPickupHealth = [&](const int nAmount, int nSound = -1)
const auto doPickupHealth = [=](const int nAmount, int nSound = -1)
{
if (nAmount <= 0 || (!(nFlags & 2)))
{
int tintRed = 0, tintGreen = 16;
if (!pPlayer->invincibility || nAmount > 0)
{
pPlayer->nHealth += nAmount;
@ -204,7 +203,7 @@ void doPlayerItemPickups(Player* const pPlayer)
doProcessPickup();
}
doConsoleMessage(nSound);
doConsoleMessage(nSound, tintRed, tintGreen);
}
};
@ -371,10 +370,8 @@ void doPlayerItemPickups(Player* const pPlayer)
if (pPlayer->nLives < kMaxPlayerLives)
{
pPlayer->nLives++;
tintGreen = 32;
tintRed = 32;
doProcessPickup();
doConsoleMessage();
doConsoleMessage(-1, 32, 32);
}
break;