From ad7b947da324c7e3219e4fb2e47bce1006327d97 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 21 Feb 2018 21:19:09 -0500
Subject: XEEN: Change Resource String fields to const char *

All too many of the resource strings are used as parameters in
Common::String::format calls, and it proved too laborious trying
to add .c_str() suffixes everywhere it'd be appropriate. Easier
to simply change all the Reosucre fields back to being const char *
---
 engines/xeen/character.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index d98142eacb..69fbc1666a 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -61,7 +61,7 @@ AttributeCategory XeenItem::getAttributeCategory() const {
 	return (AttributeCategory)idx;
 }
 
-const Common::String &XeenItem::getItemName(ItemCategory category, uint id) {
+const char *XeenItem::getItemName(ItemCategory category, uint id) {
 	if (id < 82)
 		return Res.ITEM_NAMES[category][id];
 
@@ -294,7 +294,7 @@ Common::String WeaponItems::getFullDescription(int itemIndex, int displayNum) {
 		(i._bonusFlags & ITEMFLAG_BROKEN) ? Res.ITEM_BROKEN : "",
 		(i._bonusFlags & ITEMFLAG_CURSED) ? Res.ITEM_CURSED : "",
 		displayNum,
-		Res.WEAPON_NAMES[i._id].c_str(),
+		Res.WEAPON_NAMES[i._id],
 		!i._bonusFlags ? "" : Res.BONUS_NAMES[i._bonusFlags & ITEMFLAG_BONUS_MASK],
 		(i._bonusFlags & (ITEMFLAG_BROKEN | ITEMFLAG_CURSED)) ||
 			!i._bonusFlags ? "\b " : ""
@@ -451,10 +451,10 @@ Common::String ArmorItems::getFullDescription(int itemIndex, int displayNum) {
 
 	return Common::String::format("\f%02u%s%s%s\f%02u%s%s", displayNum,
 		!i._bonusFlags ? "" : res._maeNames[i._material].c_str(),
-		(i._bonusFlags & ITEMFLAG_BROKEN) ? Res.ITEM_BROKEN.c_str() : "",
-		(i._bonusFlags & ITEMFLAG_CURSED) ? Res.ITEM_CURSED.c_str() : "",
+		(i._bonusFlags & ITEMFLAG_BROKEN) ? Res.ITEM_BROKEN : "",
+		(i._bonusFlags & ITEMFLAG_CURSED) ? Res.ITEM_CURSED : "",
 		displayNum,
-		Res.ARMOR_NAMES[i._id].c_str(),
+		Res.ARMOR_NAMES[i._id],
 		(i._bonusFlags & (ITEMFLAG_BROKEN | ITEMFLAG_CURSED)) ||
 			!i._bonusFlags ? "\b " : ""
 	);
@@ -568,10 +568,10 @@ Common::String AccessoryItems::getFullDescription(int itemIndex, int displayNum)
 
 	return Common::String::format("\f%02u%s%s%s\f%02u%s%s", displayNum,
 		!i._bonusFlags ? "" : res._maeNames[i._material].c_str(),
-		(i._bonusFlags & ITEMFLAG_BROKEN) ? Res.ITEM_BROKEN.c_str() : "",
-		(i._bonusFlags & ITEMFLAG_CURSED) ? Res.ITEM_CURSED.c_str() : "",
+		(i._bonusFlags & ITEMFLAG_BROKEN) ? Res.ITEM_BROKEN : "",
+		(i._bonusFlags & ITEMFLAG_CURSED) ? Res.ITEM_CURSED : "",
 		displayNum,
-		Res.ARMOR_NAMES[i._id].c_str(),
+		Res.ARMOR_NAMES[i._id],
 		(i._bonusFlags & (ITEMFLAG_BROKEN | ITEMFLAG_CURSED)) ||
 			!i._bonusFlags ? "\b " : ""
 	);
@@ -614,10 +614,10 @@ Common::String MiscItems::getFullDescription(int itemIndex, int displayNum) {
 
 	return Common::String::format("\f%02u%s%s%s\f%02u%s%s", displayNum,
 		!i._bonusFlags ? "" : res._maeNames[i._material].c_str(),
-		(i._bonusFlags & ITEMFLAG_BROKEN) ? Res.ITEM_BROKEN.c_str() : "",
-		(i._bonusFlags & ITEMFLAG_CURSED) ? Res.ITEM_CURSED.c_str() : "",
+		(i._bonusFlags & ITEMFLAG_BROKEN) ? Res.ITEM_BROKEN : "",
+		(i._bonusFlags & ITEMFLAG_CURSED) ? Res.ITEM_CURSED : "",
 		displayNum,
-		Res.ARMOR_NAMES[i._id].c_str(),
+		Res.ARMOR_NAMES[i._id],
 		(i._bonusFlags & (ITEMFLAG_BROKEN | ITEMFLAG_CURSED)) ||
 			!i._id ? "\b " : ""
 	);
-- 
cgit v1.2.3