ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

XEEN: Use correct quest items list depending on game

Browse Source
This commit is contained in:
Paul Gilbert
2018-03-28 21:40:54 -04:00
parent 8c4f90893d
commit 78db92eb33
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/xeen/dialogs/dialogs_quests.cpp
+3 -2
View File
@@ -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;
}
}
engines/xeen/item.cpp
+5 -4
View File
@@ -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];
}
}