From 0922d44199aa492cd57bc3fe1a40e0ff631e98ba Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 15 Apr 2018 23:27:26 -0400
Subject: XEEN: Added differences introduced in Swords of Xeen

---
 engines/xeen/item.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'engines/xeen/item.cpp')

diff --git a/engines/xeen/item.cpp b/engines/xeen/item.cpp
index 7b0710e71c..a364dad928 100644
--- a/engines/xeen/item.cpp
+++ b/engines/xeen/item.cpp
@@ -86,7 +86,10 @@ AttributeCategory XeenItem::getAttributeCategory() const {
 }
 
 const char *XeenItem::getItemName(ItemCategory category, uint id) {
-	if (id < 82) {
+	const char **questItems = (g_vm->getGameID() == GType_Swords) ? Res.QUEST_ITEM_NAMES_SWORDS : Res.QUEST_ITEM_NAMES;
+	const uint QUEST_OFFSET = g_vm->getGameID() == GType_Swords ? 88 : 82;
+
+	if (id < QUEST_OFFSET) {
 		switch (category) {
 		case CATEGORY_WEAPON:
 			assert(id < 41);
@@ -102,18 +105,16 @@ const char *XeenItem::getItemName(ItemCategory category, uint id) {
 			return Res.MISC_NAMES[id];
 		}
 	} else {
-		const char **questItems = (g_vm->getGameID() == GType_Swords) ? Res.QUEST_ITEM_NAMES_SWORDS : Res.QUEST_ITEM_NAMES;
-
 		switch (category) {
 		case CATEGORY_WEAPON:
-			return questItems[id - 82];
+			return questItems[id - QUEST_OFFSET];
 		case CATEGORY_ARMOR:
-			return questItems[id - 82 + 35];
+			return questItems[id - QUEST_OFFSET + 35];
 		case CATEGORY_ACCESSORY:
-			return questItems[id - 82 + 35 + 14];
+			return questItems[id - QUEST_OFFSET + 35 + 14];
 		default:
 			assert(g_vm->getGameID() != GType_Swords);
-			return questItems[id - 82 + 35 + 14 + 11];
+			return questItems[id - QUEST_OFFSET + 35 + 14 + 11];
 		}
 	}
 }
-- 
cgit v1.2.3