[Scummvm-git-logs] scummvm master -> 78db92eb33dbc5fd0a32399294d9ba67690c4bd4
dreammaster
dreammaster at scummvm.org
Thu Mar 29 03:40:56 CEST 2018
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
78db92eb33 XEEN: Use correct quest items list depending on game
Commit: 78db92eb33dbc5fd0a32399294d9ba67690c4bd4
https://github.com/scummvm/scummvm/commit/78db92eb33dbc5fd0a32399294d9ba67690c4bd4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-28T21:40:54-04:00
Commit Message:
XEEN: Use correct quest items list depending on game
Changed paths:
engines/xeen/dialogs/dialogs_quests.cpp
engines/xeen/item.cpp
diff --git a/engines/xeen/dialogs/dialogs_quests.cpp b/engines/xeen/dialogs/dialogs_quests.cpp
index e4f6227..8f8ebe7 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 3108b2a..c50276d 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];
}
}
More information about the Scummvm-git-logs
mailing list