From 4642e04fa306218caed0c26c00674cd5b3c4977c Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 12 Apr 2019 02:11:41 +0200 Subject: [PATCH] Clean up S_SIDEnter --- Source/stores.cpp | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/Source/stores.cpp b/Source/stores.cpp index 0f66913e8..e9591ac41 100644 --- a/Source/stores.cpp +++ b/Source/stores.cpp @@ -3106,36 +3106,23 @@ void S_StoryEnter() void S_SIDEnter() { - int idx; // eax - int v1; // edx - int v2; // ecx - BOOLEAN v3; // sf - //unsigned char v4; // of - char v5; // cl + int idx; if (stextsel == 22) { StartStore(STORE_STORY); stextsel = 14; } else { - stextlhold = stextsel; stextshold = 17; - idx = stextsval + ((stextsel - stextup) >> 2); - v1 = myplr; + stextlhold = stextsel; stextvhold = stextsval; - qmemcpy(&plr[myplr].HoldItem, &storehold[idx], sizeof(plr[myplr].HoldItem)); - v2 = plr[v1]._pGold; - //v4 = __OFSUB__(v2, storehold[idx]._iIvalue); - v3 = v2 - storehold[idx]._iIvalue < 0; - v5 = STORE_NOMONEY; - if (!v3) //if (!(v3 ^ v4)) - v5 = STORE_CONFIRM; - StartStore(v5); + idx = stextsval + ((stextsel - stextup) >> 2); + plr[myplr].HoldItem = storehold[idx]; + if (plr[myplr]._pGold < storehold[idx]._iIvalue) + StartStore(STORE_NOMONEY); + else + StartStore(STORE_CONFIRM); } } -// 69F108: using guessed type int stextup; -// 69F110: using guessed type int stextlhold; -// 6A8A24: using guessed type int stextvhold; -// 6A8A28: using guessed type int stextsel; void S_TalkEnter() {