XEEN: Fixes for full description of misc items

3 files changed, 8 insertions, 4 deletions

diff --git a/engines/xeen/item.cpp b/engines/xeen/item.cpp
index a79efc085d..d745d2e130 100644
--- a/engines/xeen/item.cpp
+++ b/engines/xeen/item.cpp
@@ -664,14 +664,14 @@ Common::String AccessoryItems::getAttributes(XeenItem &item, const Common::Strin
 
 Common::String MiscItems::getFullDescription(int itemIndex, int displayNum) {
 	XeenItem &i = operator[](itemIndex);
-	Resources &res = *getVm()->_resources;
 
-	Common::String desc = Common::String::format("\f%02u%s%s%s\f%02u%s%s", displayNum,
-		i._state._cursed || i._state._broken ? "" : res._maeNames[i._material].c_str(),
+	Common::String desc = Common::String::format("\f%02u%s%s\f%02u%s%s%s%s", displayNum,
 		i._state._broken ? Res.ITEM_BROKEN : "",
 		i._state._cursed ? Res.ITEM_CURSED : "",
 		displayNum,
-		Res.MISC_NAMES[i._id],
+		Res.MISC_NAMES[i._material],
+		(i._state._cursed || i._state._broken) || !i._id ? "" : Res.ITEM_OF,
+		(i._state._cursed || i._state._broken) ? "" : Res.SPECIAL_NAMES[i._id],
 		(i._state._cursed || i._state._broken) || !i._id ? "\b " : ""
 	);
 	capitalizeItem(desc);
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index df7545976e..c599480e2f 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -249,11 +249,13 @@ void Resources::loadData() {
 	file.syncString(BTN_GOLD);
 	file.syncString(ITEM_BROKEN);
 	file.syncString(ITEM_CURSED);
+	file.syncString(ITEM_OF);
 	file.syncStrings(BONUS_NAMES, 7);
 	file.syncStrings(WEAPON_NAMES, 41);
 	file.syncStrings(ARMOR_NAMES, 14);
 	file.syncStrings(ACCESSORY_NAMES, 11);
 	file.syncStrings(MISC_NAMES, 22);
+	file.syncStrings(SPECIAL_NAMES, 74);
 	file.syncStrings(ELEMENTAL_NAMES, 6);
 	file.syncStrings(ATTRIBUTE_NAMES, 10);
 	file.syncStrings(EFFECTIVENESS_NAMES, 7);
diff --git a/engines/xeen/resources.h b/engines/xeen/resources.h
index d47bc4da45..007aaa3a75 100644
--- a/engines/xeen/resources.h
+++ b/engines/xeen/resources.h
@@ -304,11 +304,13 @@ public:
 	const char *BTN_GOLD;
 	const char *ITEM_BROKEN;
 	const char *ITEM_CURSED;
+	const char *ITEM_OF;
 	const char *BONUS_NAMES[7];
 	const char *WEAPON_NAMES[35];
 	const char *ARMOR_NAMES[14];
 	const char *ACCESSORY_NAMES[11];
 	const char *MISC_NAMES[22];
+	const char *SPECIAL_NAMES[74];
 	const char *ELEMENTAL_NAMES[6];
 	const char *ATTRIBUTE_NAMES[10];
 	const char *EFFECTIVENESS_NAMES[7];