MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up some players references

Browse source
This commit is contained in:
Anders Jenbo 2021-08-28 15:47:08 +02:00
commit 4044fadeb5
22 changed files with 204 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/control.cpp
View file

@ -571,10 +571,8 @@ void ControlUpDown(int v)
}
}
void RemoveGold(int pnum, int goldIndex)
void RemoveGold(PlayerStruct &player, int goldIndex)
{
auto &player = Players[pnum];
int gi = goldIndex - INVITEM_INV_FIRST;
player.InvList[gi]._ivalue -= dropGoldValue;
if (player.InvList[gi]._ivalue > 0)
@ -582,7 +580,7 @@ void RemoveGold(int pnum, int goldIndex)
else
player.RemoveInvItem(gi);
SetPlrHandItem(player.HoldItem, IDI_GOLD);
GetGoldSeed(pnum, &player.HoldItem);
SetGoldSeed(player, player.HoldItem);
player.HoldItem._ivalue = dropGoldValue;
player.HoldItem._iStatFlag = true;
ControlSetGoldCurs(player);
@ -1864,19 +1862,20 @@ void DrawGoldSplit(const Surface &out, int amount)
void control_drop_gold(char vkey)
{
char input[6];
auto &myPlayer = Players[MyPlayerId];
if (Players[MyPlayerId]._pHitPoints >> 6 <= 0) {
if (myPlayer._pHitPoints >> 6 <= 0) {
dropGoldFlag = false;
dropGoldValue = 0;
return;
}
char input[6];
memset(input, 0, sizeof(input));
snprintf(input, sizeof(input), "%i", dropGoldValue);
if (vkey == DVL_VK_RETURN) {
if (dropGoldValue > 0)
RemoveGold(MyPlayerId, initialDropGoldIndex);
RemoveGold(myPlayer, initialDropGoldIndex);
dropGoldFlag = false;
} else if (vkey == DVL_VK_ESCAPE) {
dropGoldFlag = false;