Clean up WitchBuyItem

diasurgical · Oct 22, 2020 · 9150cb7 · 9150cb7 · qndel · Oct 22, 2020
1 parent 8040716
commit 9150cb7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Source/stores.cpp b/Source/stores.cpp
@@ -2282,8 +2282,8 @@ void WitchBuyItem()
 	StoreAutoPlace();
 
 	if (idx >= 3) {
-		if (idx == 19) {
-			witchitem[19]._itype = ITYPE_NONE;
+		if (idx == WITCH_ITEMS - 1) {
+			witchitem[WITCH_ITEMS - 1]._itype = ITYPE_NONE;
 		} else {
 			for (; witchitem[idx + 1]._itype != ITYPE_NONE; idx++) {
 				witchitem[idx] = witchitem[idx + 1];

diff --git a/defs.h b/defs.h
@@ -95,13 +95,15 @@
 // todo: enums
 #ifdef HELLFIRE
 #define NUMLEVELS				25
+#define WITCH_ITEMS				25
 #define SMITH_ITEMS				25
 #define SMITH_PREMIUM_ITEMS		15
 #define SMITH_MAX_VALUE			200000
 #define SMITH_MAX_PREMIUM_VALUE 200000
 #define STORE_LINES				104
 #else
 #define NUMLEVELS				17
+#define WITCH_ITEMS				20
 #define SMITH_ITEMS				20
 #define SMITH_PREMIUM_ITEMS		6
 #define SMITH_MAX_VALUE			140000