libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-05 09:10:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XEEN: Fixes for calculating weapon costs

Browse Source
This commit is contained in:
Paul Gilbert 2017-11-24 16:49:38 -05:00
parent 63f1b310bb
commit b1f21cd768
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/xeen/dialogs_items.cpp
View File

@ -669,6 +669,13 @@ int ItemsDialog::calcItemCost(Character *c, int itemIndex, ItemsMode mode,
int result = 0;
int level = skillLevel & 0x7f;
InventoryItems *invGroups[4] = {
&c->_weapons, &c->_armor, &c->_accessories, &c->_misc
};
const int *BASE_COSTS[4] = {
Res.WEAPON_BASE_COSTS, Res.ARMOR_BASE_COSTS, Res.ACCESSORY_BASE_COSTS, Res.MISC_BASE_COSTS
};
switch (mode) {
case ITEMMODE_BLACKSMITH:
level = 0;
@ -691,11 +698,8 @@ int ItemsDialog::calcItemCost(Character *c, int itemIndex, ItemsMode mode,
case CATEGORY_WEAPON:
case CATEGORY_ARMOR:
case CATEGORY_ACCESSORY: {
// 0=Weapons, 1=Armor, 2=Accessories
XeenItem &i = (mode == 0) ? c->_weapons[itemIndex] :
(mode == 1 ? c->_armor[itemIndex] : c->_accessories[itemIndex]);
amount1 = (mode == 0) ? Res.WEAPON_BASE_COSTS[i._id] :
(mode == 1 ? Res.ARMOR_BASE_COSTS[i._id] : Res.ACCESSORY_BASE_COSTS[i._id]);
XeenItem &i = (*invGroups[category])[itemIndex];
amount1 = (BASE_COSTS[category])[i._id];
if (i._material > 36 && i._material < 59) {
switch (i._material) {
@ -738,7 +742,7 @@ int ItemsDialog::calcItemCost(Character *c, int itemIndex, ItemsMode mode,
break;
}
case 3: {
case CATEGORY_MISC: {
// Misc
XeenItem &i = c->_misc[itemIndex];
amount1 = Res.MISC_MATERIAL_COSTS[i._material];