From 0d242ca3a0cf7ab44e94fc0a820eb0ec3d588fa2 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 12 Apr 2019 01:16:01 +0200 Subject: [PATCH] Clean up WitchRechargeItem --- Source/stores.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/stores.cpp b/Source/stores.cpp index b3610ca65..59c078777 100644 --- a/Source/stores.cpp +++ b/Source/stores.cpp @@ -2827,19 +2827,18 @@ void S_WSellEnter() void WitchRechargeItem() { - int i; // ecx - int idx; // eax + int i, idx; TakePlrsMoney(plr[myplr].HoldItem._iIvalue); idx = stextvhold + ((stextlhold - stextup) >> 2); - i = storehidx[idx]; storehold[idx]._iCharges = storehold[idx]._iMaxCharges; - if (i >= 0) - plr[myplr].InvList[i]._iCharges = plr[myplr].InvList[i]._iMaxCharges; - else + i = storehidx[idx]; + if (i < 0) plr[myplr].InvBody[INVLOC_HAND_LEFT]._iCharges = plr[myplr].InvBody[INVLOC_HAND_LEFT]._iMaxCharges; + else + plr[myplr].InvList[i]._iCharges = plr[myplr].InvList[i]._iMaxCharges; CalcPlrInv(myplr, 1u); }