Skip to content

Fix min diff in UseInvItem. #1210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2019
Merged

Fix min diff in UseInvItem. #1210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions Source/inv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,7 +2090,7 @@ void StartGoldDrop()

BOOL UseInvItem(int pnum, int cii)
{
int c, idata, it;
int c, idata;
ItemStruct *Item;
BOOL speedlist;

Expand All @@ -2111,8 +2111,8 @@ BOOL UseInvItem(int pnum, int cii)
if (talkflag)
return TRUE;
c = cii - 47;
speedlist = TRUE;
Item = &plr[pnum].SpdList[c];
speedlist = TRUE;
}

switch (Item->IDidx) {
Expand Down Expand Up @@ -2152,9 +2152,7 @@ BOOL UseInvItem(int pnum, int cii)
return TRUE;
}

it = Item->_iMiscId;

if (it == IMISC_NONE && Item->_itype == ITYPE_GOLD) {
if (Item->_iMiscId == IMISC_NONE && Item->_itype == ITYPE_GOLD) {
StartGoldDrop();
return TRUE;
}
Expand All @@ -2164,13 +2162,13 @@ BOOL UseInvItem(int pnum, int cii)
dropGoldValue = 0;
}

if (it == IMISC_SCROLL && currlevel == 0 && !spelldata[Item->_iSpell].sTownSpell
|| it == IMISC_SCROLLT && currlevel == 0 && !spelldata[Item->_iSpell].sTownSpell) {
if ((Item->_iMiscId == IMISC_SCROLL && currlevel == 0 && !spelldata[Item->_iSpell].sTownSpell)
|| (Item->_iMiscId == IMISC_SCROLLT && currlevel == 0 && !spelldata[Item->_iSpell].sTownSpell)) {
return TRUE;
}

idata = ItemCAnimTbl[Item->_iCurs];
if (it == IMISC_BOOK)
if (Item->_iMiscId == IMISC_BOOK)
PlaySFX(IS_RBOOK);
else if (pnum == myplr)
PlaySFX(ItemInvSnds[idata]);
Expand Down