From 57dca8fc25b4ef46cf6603049f80c9ea79f5d24a Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 5 Apr 2019 20:18:59 +0200 Subject: [PATCH] Clean up UseStaff --- Source/inv.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Source/inv.cpp b/Source/inv.cpp index cd0b89585..dc198a5a0 100644 --- a/Source/inv.cpp +++ b/Source/inv.cpp @@ -2562,20 +2562,16 @@ void __fastcall UseStaffCharge(int pnum) BOOL __cdecl UseStaff() { - int v0; // eax - BOOL result; // al - - result = FALSE; if (pcurs == CURSOR_HAND) { - v0 = myplr; if (plr[myplr].InvBody[INVLOC_HAND_LEFT]._itype != ITYPE_NONE - && plr[v0].InvBody[INVLOC_HAND_LEFT]._iMiscId == IMISC_STAFF - && plr[v0].InvBody[INVLOC_HAND_LEFT]._iSpell == plr[v0]._pRSpell - && plr[v0].InvBody[INVLOC_HAND_LEFT]._iCharges > 0) { - result = TRUE; + && plr[myplr].InvBody[INVLOC_HAND_LEFT]._iMiscId == IMISC_STAFF + && plr[myplr].InvBody[INVLOC_HAND_LEFT]._iSpell == plr[myplr]._pRSpell + && plr[myplr].InvBody[INVLOC_HAND_LEFT]._iCharges > 0) { + return TRUE; } } - return result; + + return FALSE; } void __cdecl StartGoldDrop()