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

2435 refactor global variable Items part 2 (#2673)

Browse source
This commit is contained in:
BC Ko 2021-08-25 23:06:48 -07:00 • committed by GitHub
commit 4df798808e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 434 additions and 447 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/objects.cpp
View file

@ -2977,14 +2977,14 @@ bool OperateShrineEldritch(int pnum)
if (player.InvList[j]._itype == ITYPE_MISC) {
if (player.InvList[j]._iMiscId == IMISC_HEAL
|| player.InvList[j]._iMiscId == IMISC_MANA) {
SetPlrHandItem(&player.HoldItem, ItemMiscIdIdx(IMISC_REJUV));
SetPlrHandItem(player.HoldItem, ItemMiscIdIdx(IMISC_REJUV));
GetPlrHandSeed(&player.HoldItem);
player.HoldItem._iStatFlag = true;
player.InvList[j] = player.HoldItem;
}
if (player.InvList[j]._iMiscId == IMISC_FULLHEAL
|| player.InvList[j]._iMiscId == IMISC_FULLMANA) {
SetPlrHandItem(&player.HoldItem, ItemMiscIdIdx(IMISC_FULLREJUV));
SetPlrHandItem(player.HoldItem, ItemMiscIdIdx(IMISC_FULLREJUV));
GetPlrHandSeed(&player.HoldItem);
player.HoldItem._iStatFlag = true;
player.InvList[j] = player.HoldItem;
@ -2995,14 +2995,14 @@ bool OperateShrineEldritch(int pnum)
if (item._itype == ITYPE_MISC) {
if (item._iMiscId == IMISC_HEAL
|| item._iMiscId == IMISC_MANA) {
SetPlrHandItem(&player.HoldItem, ItemMiscIdIdx(IMISC_REJUV));
SetPlrHandItem(player.HoldItem, ItemMiscIdIdx(IMISC_REJUV));
GetPlrHandSeed(&player.HoldItem);
player.HoldItem._iStatFlag = true;
item = player.HoldItem;
}
if (item._iMiscId == IMISC_FULLHEAL
|| item._iMiscId == IMISC_FULLMANA) {
SetPlrHandItem(&player.HoldItem, ItemMiscIdIdx(IMISC_FULLREJUV));
SetPlrHandItem(player.HoldItem, ItemMiscIdIdx(IMISC_FULLREJUV));
GetPlrHandSeed(&player.HoldItem);
player.HoldItem._iStatFlag = true;
item = player.HoldItem;
@ -3151,7 +3151,7 @@ bool OperateShrineSpiritual(int pnum)
gridItem = player._pNumInv;
player.InvList[t]._ivalue = r;
player._pGold += r;
SetPlrHandGoldCurs(&player.InvList[t]);
SetPlrHandGoldCurs(player.InvList[t]);
}
}