aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/xeen/character.cpp8
-rw-r--r--engines/xeen/dialogs_items.cpp10
-rw-r--r--engines/xeen/dialogs_spells.cpp8
-rw-r--r--engines/xeen/module.mk6
-rw-r--r--engines/xeen/spells.cpp2
5 files changed, 17 insertions, 17 deletions
diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index ea0f9f532e..ca224ab4f1 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -300,7 +300,7 @@ Common::String WeaponItems::getFullDescription(int itemIndex, int displayNum) {
Resources &res = *vm()->_resources;
return Common::String::format("\f%02u%s%s%s\f%02u%s%s%s", displayNum,
- !i._bonusFlags ? res._maeNames[i._material] : "",
+ !i._bonusFlags ? res._maeNames[i._material].c_str() : "",
(i._bonusFlags & ITEMFLAG_BROKEN) ? ITEM_BROKEN : "",
(i._bonusFlags & ITEMFLAG_CURSED) ? ITEM_CURSED : "",
WEAPON_NAMES[i._id],
@@ -466,7 +466,7 @@ Common::String ArmorItems::getFullDescription(int itemIndex, int displayNum) {
Resources &res = *vm()->_resources;
return Common::String::format("\f%02u%s%s%s\f%02u%s%s", displayNum,
- !i._bonusFlags ? "" : res._maeNames[i._material],
+ !i._bonusFlags ? "" : res._maeNames[i._material].c_str(),
(i._bonusFlags & ITEMFLAG_BROKEN) ? ITEM_BROKEN : "",
(i._bonusFlags & ITEMFLAG_CURSED) ? ITEM_CURSED : "",
ARMOR_NAMES[i._id],
@@ -589,7 +589,7 @@ Common::String AccessoryItems::getFullDescription(int itemIndex, int displayNum)
Resources &res = *vm()->_resources;
return Common::String::format("\f%02u%s%s%s\f%02u%s%s", displayNum,
- !i._bonusFlags ? "" : res._maeNames[i._material],
+ !i._bonusFlags ? "" : res._maeNames[i._material].c_str(),
(i._bonusFlags & ITEMFLAG_BROKEN) ? ITEM_BROKEN : "",
(i._bonusFlags & ITEMFLAG_CURSED) ? ITEM_CURSED : "",
ARMOR_NAMES[i._id],
@@ -638,7 +638,7 @@ Common::String MiscItems::getFullDescription(int itemIndex, int displayNum) {
Resources &res = *vm()->_resources;
return Common::String::format("\f%02u%s%s%s\f%02u%s%s", displayNum,
- !i._bonusFlags ? "" : res._maeNames[i._material],
+ !i._bonusFlags ? "" : res._maeNames[i._material].c_str(),
(i._bonusFlags & ITEMFLAG_BROKEN) ? ITEM_BROKEN : "",
(i._bonusFlags & ITEMFLAG_CURSED) ? ITEM_CURSED : "",
ARMOR_NAMES[i._id],
diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp
index 21a8856e3c..bdcdffaa84 100644
--- a/engines/xeen/dialogs_items.cpp
+++ b/engines/xeen/dialogs_items.cpp
@@ -149,11 +149,11 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
|| mode == ITEMMODE_ENCHANT || mode == ITEMMODE_RECHARGE) {
lines.push_back(Common::String::format(ITEMS_DIALOG_LINE1,
arr[idx], idx + 1,
- c->_items[category].getFullDescription(idx, arr[idx])));
+ c->_items[category].getFullDescription(idx, arr[idx]).c_str()));
} else {
lines.push_back(Common::String::format(ITEMS_DIALOG_LINE2,
arr[idx], idx + 1,
- c->_items[category].getFullDescription(idx, arr[idx]),
+ c->_items[category].getFullDescription(idx, arr[idx]).c_str(),
calcItemCost(c, idx, mode,
mode == ITEMMODE_TO_GOLD ? 1 : startingChar->_skills[MERCHANT],
category)
@@ -194,7 +194,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
lines.push_back(Common::String::format(ITEMS_DIALOG_LINE2,
arr[idx], idx + 1,
- c->_items[category].getFullDescription(idx, arr[idx]),
+ c->_items[category].getFullDescription(idx, arr[idx]).c_str(),
calcItemCost(c, idx, tempMode, skill, category)
));
}
@@ -1002,7 +1002,7 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite
int cost = calcItemCost(&c, itemIndex, mode, actionIndex, category);
Common::String msg = Common::String::format(FIX_IDENTIFY_GOLD,
FIX_IDENTIFY[0],
- c._items[category].getFullDescription(itemIndex),
+ c._items[category].getFullDescription(itemIndex).c_str(),
cost);
if (Confirm::show(_vm, msg) && party.subtract(0, cost, 0)) {
@@ -1015,7 +1015,7 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite
int cost = calcItemCost(&c, itemIndex, mode, actionIndex, category);
Common::String msg = Common::String::format(FIX_IDENTIFY_GOLD,
FIX_IDENTIFY[1],
- c._items[category].getFullDescription(itemIndex),
+ c._items[category].getFullDescription(itemIndex).c_str(),
cost);
if (Confirm::show(_vm, msg) && party.subtract(0, cost, 0)) {
diff --git a/engines/xeen/dialogs_spells.cpp b/engines/xeen/dialogs_spells.cpp
index 08828a0c8d..70668e2ea5 100644
--- a/engines/xeen/dialogs_spells.cpp
+++ b/engines/xeen/dialogs_spells.cpp
@@ -67,7 +67,7 @@ Character *SpellsDialog::execute(ButtonContainer *priorDialog, Character *c, int
Common::String title = Common::String::format(BUY_SPELLS, c->_name.c_str());
Common::String msg = Common::String::format(GUILD_OPTIONS,
- title.c_str(), XeenEngine::printMil(party._gold));
+ title.c_str(), XeenEngine::printMil(party._gold).c_str());
screen._windows[10].writeString(msg);
warning("TODO: Sprite draw using previously used button sprites");
@@ -353,7 +353,7 @@ const char *SpellsDialog::setSpellText(Character *c, int isCasting) {
if (!c->_spells[idx] || (isCasting & 0x80)) {
int cost = spells.calcSpellCost(SPELLS_ALLOWED[category][idx], expenseFactor);
_spells.push_back(SpellEntry(Common::String::format("\x3l%s\x3r\x9""000%u",
- spells._spellNames[SPELLS_ALLOWED[category][idx]], cost),
+ spells._spellNames[SPELLS_ALLOWED[category][idx]].c_str(), cost),
idx, spellId));
}
}
@@ -370,7 +370,7 @@ const char *SpellsDialog::setSpellText(Character *c, int isCasting) {
if (!c->_spells[idx] || (isCasting & 0x80)) {
int cost = spells.calcSpellCost(SPELLS_ALLOWED[category][idx], expenseFactor);
_spells.push_back(SpellEntry(Common::String::format("\x3l%s\x3r\x9""000%u",
- spells._spellNames[SPELLS_ALLOWED[category][idx]], cost),
+ spells._spellNames[SPELLS_ALLOWED[category][idx]].c_str(), cost),
idx, spellId));
}
}
@@ -385,7 +385,7 @@ const char *SpellsDialog::setSpellText(Character *c, int isCasting) {
if (!c->_spells[idx] || (isCasting & 0x80)) {
int cost = spells.calcSpellCost(SPELLS_ALLOWED[category][idx], expenseFactor);
_spells.push_back(SpellEntry(Common::String::format("\x3l%s\x3r\x9""000%u",
- spells._spellNames[SPELLS_ALLOWED[category][idx]], cost),
+ spells._spellNames[SPELLS_ALLOWED[category][idx]].c_str(), cost),
idx, spellId));
}
}
diff --git a/engines/xeen/module.mk b/engines/xeen/module.mk
index 1fe29c6a8e..4e64b8e815 100644
--- a/engines/xeen/module.mk
+++ b/engines/xeen/module.mk
@@ -1,9 +1,9 @@
MODULE := engines/xeen
MODULE_OBJS := \
- clouds\clouds_game.o \
- darkside\darkside_game.o \
- worldofxeen\worldofxeen_game.o \
+ clouds/clouds_game.o \
+ darkside/darkside_game.o \
+ worldofxeen/worldofxeen_game.o \
character.o \
combat.o \
debugger.o \
diff --git a/engines/xeen/spells.cpp b/engines/xeen/spells.cpp
index d446b3ce6e..8166a1b029 100644
--- a/engines/xeen/spells.cpp
+++ b/engines/xeen/spells.cpp
@@ -151,7 +151,7 @@ int Spells::castSpell(Character *c, int spellId) {
// Return the spell costs and flag that another spell can be selected
addSpellCost(*c, spellId);
ErrorDialog::show(_vm, Common::String::format(CANT_CAST_WHILE_ENGAGED,
- _spellNames[spellId]));
+ _spellNames[spellId].c_str()));
result = -1;
}
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 07:04:43 +0000