diff options
author | Paul Gilbert | 2016-08-28 15:46:10 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-08-28 15:46:10 -0400 |
commit | ef6253fb19822b9a2e9a1ba00418f1d33afff65f (patch) | |
tree | 367e064d6a1e2d7f233f624e8fe2e975d20722ff /engines/xeen/dialogs_items.cpp | |
parent | 0c199f079bc1ed62e6c13f292d569fc52eac546c (diff) | |
download | scummvm-rg350-ef6253fb19822b9a2e9a1ba00418f1d33afff65f.tar.gz scummvm-rg350-ef6253fb19822b9a2e9a1ba00418f1d33afff65f.tar.bz2 scummvm-rg350-ef6253fb19822b9a2e9a1ba00418f1d33afff65f.zip |
XEEN: gcc compilation fixes
Diffstat (limited to 'engines/xeen/dialogs_items.cpp')
-rw-r--r-- | engines/xeen/dialogs_items.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp index bdcdffaa84..147f934a61 100644 --- a/engines/xeen/dialogs_items.cpp +++ b/engines/xeen/dialogs_items.cpp @@ -913,8 +913,8 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite break; case ITEMMODE_BLACKSMITH: { - InventoryItems &items = _oldCharacter->_items[category]; - if (items[INV_ITEMS_TOTAL - 1]._id) { + InventoryItems &invItems = _oldCharacter->_items[category]; + if (invItems[INV_ITEMS_TOTAL - 1]._id) { // If the last slot is in use, it means the list is full ErrorScroll::show(_vm, Common::String::format(BACKPACK_IS_FULL, _oldCharacter->_name.c_str())); @@ -1021,13 +1021,13 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite if (Confirm::show(_vm, msg) && party.subtract(0, cost, 0)) { Common::String details = c._items[category].getIdentifiedDetails(itemIndex); Common::String desc = c._items[category].getFullDescription(itemIndex); - Common::String msg = Common::String::format(IDENTIFY_ITEM_MSG, + Common::String str = Common::String::format(IDENTIFY_ITEM_MSG, desc.c_str(), details.c_str()); - Window &w = screen._windows[14]; - w.open(); - w.writeString(msg); - w.update(); + Window &win = screen._windows[14]; + win.open(); + win.writeString(str); + win.update(); saveButtons(); clearButtons(); @@ -1037,7 +1037,7 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite events.clearEvents(); restoreButtons(); - w.close(); + win.close(); } break; } |