From 9b3eb784d5aec9ac0d21684b61cd414a1bb31e91 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sat, 27 Apr 2019 03:38:27 +0200
Subject: [PATCH] Clean up S_ScrollSPBuy

---
 Source/stores.cpp | 68 +++++++++++++++++------------------------------
 1 file changed, 25 insertions(+), 43 deletions(-)

diff --git a/Source/stores.cpp b/Source/stores.cpp
index 35c5c6c02..214749dce 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -577,55 +577,37 @@ void S_StartSBuy()
 
 void S_ScrollSPBuy(int idx)
 {
-	int v1;   // esi
-	int v2;   // edi
-	int v3;   // eax
-	int v4;   // esi
-	int *v5;  // ecx
-	char *v6; // esi
-	int iclr; // [esp+Ch] [ebp-4h]
-
-	v1 = idx;
-	v2 = 5;
+	int l, boughtitems;
+	char iclr;
+
 	ClearSText(5, 21);
-	v3 = v1;
-	v4 = 0;
+	boughtitems = idx;
+
 	stextup = 5;
-	if (v3) {
-		v5 = &premiumitem[0]._itype;
-		do {
-			if (*v5 != ITYPE_NONE)
-				--v3;
-			++v4;
-			v5 += 92;
-		} while (v3);
-	}
-	v6 = &premiumitem[v4]._iMagical;
-	do {
-		if ((signed int)v6 >= (signed int)&premiumitem[6]._iMagical)
-			break;
-		if (*((_DWORD *)v6 - 13) == -1) {
-			v2 -= 4;
+	for (idx = 0; boughtitems; idx++) {
+		if (premiumitem[idx]._itype != ITYPE_NONE)
+			boughtitems--;
+	}
+
+	for (l = 5; l < 20 && idx < 6; l += 4) {
+		if (premiumitem[idx]._itype != -1) {
+			iclr = COL_WHITE;
+			if (premiumitem[idx]._iMagical)
+				iclr = COL_BLUE;
+			if (!premiumitem[idx]._iStatFlag)
+				iclr = COL_RED;
+			AddSText(20, l, 0, premiumitem[idx]._iIName, iclr, 1);
+			AddSTextVal(l, premiumitem[idx]._iIvalue);
+			PrintStoreItem(&premiumitem[idx], l + 1, iclr);
+			stextdown = l;
 		} else {
-			_LOBYTE(iclr) = COL_WHITE;
-			if (*v6)
-				_LOBYTE(iclr) = COL_BLUE;
-			if (!*((_DWORD *)v6 + 74))
-				_LOBYTE(iclr) = COL_RED;
-			AddSText(20, v2, 0, v6 + 65, iclr, 1);
-			AddSTextVal(v2, *((_DWORD *)v6 + 35));
-			PrintStoreItem((ItemStruct *)(v6 - 60), v2 + 1, iclr);
-			stextdown = v2;
-		}
-		v2 += 4;
-		v6 += 368;
-	} while (v2 < 20);
+			l -= 4;
+		}
+		idx++;
+	}
 	if (!stext[stextsel]._ssel && stextsel != 22)
 		stextsel = stextdown;
 }
-// 69F108: using guessed type int stextup;
-// 6A8A28: using guessed type int stextsel;
-// 6AA700: using guessed type int stextdown;
 
 BOOL S_StartSPBuy()
 {