diff options
| author | Paul Gilbert | 2018-04-01 14:01:26 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-04-01 14:01:26 -0400 |
| commit | d8a8a5741166e6114ba31ecd8af03baaa0f88b91 (patch) | |
| tree | cae90c6e9036d458d48deb51a78c412d621d69d3 /engines/xeen/item.cpp | |
| parent | 2ea485579932e9e470cb825ed107eba2a86a85c9 (diff) | |
| download | scummvm-rg350-d8a8a5741166e6114ba31ecd8af03baaa0f88b91.tar.gz scummvm-rg350-d8a8a5741166e6114ba31ecd8af03baaa0f88b91.tar.bz2 scummvm-rg350-d8a8a5741166e6114ba31ecd8af03baaa0f88b91.zip | |
XEEN: Fixes for full description of misc items
Diffstat (limited to 'engines/xeen/item.cpp')
| -rw-r--r-- | engines/xeen/item.cpp | 8 |
1 files changed, 4 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); |