diff options
| author | Paul Gilbert | 2018-03-28 21:40:54 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-03-28 21:40:54 -0400 |
| commit | 78db92eb33dbc5fd0a32399294d9ba67690c4bd4 (patch) | |
| tree | 5e62721982af96da2fb3a7d691b2aed5cc7cc9dc /engines | |
| parent | 8c4f90893d3ab43e2b01441921a138688f8696a3 (diff) | |
| download | scummvm-rg350-78db92eb33dbc5fd0a32399294d9ba67690c4bd4.tar.gz scummvm-rg350-78db92eb33dbc5fd0a32399294d9ba67690c4bd4.tar.bz2 scummvm-rg350-78db92eb33dbc5fd0a32399294d9ba67690c4bd4.zip | |
XEEN: Use correct quest items list depending on game
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/dialogs/dialogs_quests.cpp | 5 | ||||
| -rw-r--r-- | engines/xeen/item.cpp | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/engines/xeen/dialogs/dialogs_quests.cpp b/engines/xeen/dialogs/dialogs_quests.cpp index e4f62270ef..8f8ebe785d 100644 --- a/engines/xeen/dialogs/dialogs_quests.cpp +++ b/engines/xeen/dialogs/dialogs_quests.cpp @@ -44,6 +44,7 @@ void Quests::execute() { int count = 0; bool headerShown = false; int topRow = 0; + const char **questItems = (g_vm->getGameID() == GType_Swords) ? Res.QUEST_ITEM_NAMES_SWORDS : Res.QUEST_ITEM_NAMES; addButtons(); loadQuestNotes(); @@ -91,11 +92,11 @@ void Quests::execute() { case 83: case 84: lines[count++] = Common::String::format("%d %s%c", - party._questItems[idx], Res.QUEST_ITEM_NAMES[idx], + party._questItems[idx], questItems[idx], party._questItems[idx] == 1 ? ' ' : 's'); break; default: - lines[count++] = Res.QUEST_ITEM_NAMES[idx]; + lines[count++] = questItems[idx]; break; } } diff --git a/engines/xeen/item.cpp b/engines/xeen/item.cpp index 3108b2a6c6..c50276d4ae 100644 --- a/engines/xeen/item.cpp +++ b/engines/xeen/item.cpp @@ -69,18 +69,19 @@ const char *XeenItem::getItemName(ItemCategory category, uint id) { if (id < 82) return Res.ITEM_NAMES[category][id]; + const char **questItems = (g_vm->getGameID() == GType_Swords) ? Res.QUEST_ITEM_NAMES_SWORDS : Res.QUEST_ITEM_NAMES; switch (category) { case CATEGORY_WEAPON: - return Res.QUEST_ITEM_NAMES[id - 82]; + return questItems[id - 82]; case CATEGORY_ARMOR: - return Res.QUEST_ITEM_NAMES[id - 82 + 35]; + return questItems[id - 82 + 35]; case CATEGORY_ACCESSORY: - return Res.QUEST_ITEM_NAMES[id - 82 + 35 + 14]; + return questItems[id - 82 + 35 + 14]; default: - return Res.QUEST_ITEM_NAMES[id - 82 + 35 + 14 + 11]; + return questItems[id - 82 + 35 + 14 + 11]; } } |