aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen
diff options
context:
space:
mode:
Diffstat (limited to 'engines/xeen')
-rw-r--r--engines/xeen/character.h2
-rw-r--r--engines/xeen/dialogs_items.cpp539
-rw-r--r--engines/xeen/dialogs_items.h2
-rw-r--r--engines/xeen/dialogs_quests.cpp40
-rw-r--r--engines/xeen/dialogs_quests.h43
-rw-r--r--engines/xeen/module.mk1
-rw-r--r--engines/xeen/resources.cpp7
-rw-r--r--engines/xeen/resources.h2
8 files changed, 488 insertions, 148 deletions
diff --git a/engines/xeen/character.h b/engines/xeen/character.h
index 6e6a77210e..af9e331fb5 100644
--- a/engines/xeen/character.h
+++ b/engines/xeen/character.h
@@ -98,6 +98,8 @@ public:
void clear();
+ bool empty() const { return _id != 0; }
+
void synchronize(Common::Serializer &s);
ElementalCategory getElementalCategory() const;
diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp
index bbfbd95045..83e0dd23a0 100644
--- a/engines/xeen/dialogs_items.cpp
+++ b/engines/xeen/dialogs_items.cpp
@@ -22,6 +22,7 @@
#include "xeen/dialogs_items.h"
#include "xeen/dialogs_query.h"
+#include "xeen/dialogs_quests.h"
#include "xeen/resources.h"
#include "xeen/xeen.h"
@@ -47,7 +48,11 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
int varA = mode == ITEMMODE_COMBAT ? 1 : 0;
if (varA != 0)
mode = ITEMMODE_CHAR_INFO;
- int varE = mode == 1 ? 1 : 0;
+ bool updateStock = mode == ITEMMODE_BLACKSMITH;
+ int itemIndex = -1;
+ Common::StringArray lines;
+ int arr[40];
+ int actionIndex = -1;
events.setCursor(0);
loadButtons(mode, c);
@@ -55,9 +60,9 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
screen._windows[29].open();
screen._windows[30].open();
- bool redrawFlag = true;
+ enum { REDRAW_NONE, REDRAW_TEXT, REDRAW_FULL } redrawFlag = REDRAW_FULL;
while (!_vm->shouldQuit()) {
- if (redrawFlag) {
+ if (redrawFlag == REDRAW_FULL) {
if ((mode != ITEMMODE_CHAR_INFO || category != CATEGORY_MISC) && mode != ITEMMODE_ENCHANT
&& mode != ITEMMODE_RECHARGE && mode != ITEMMODE_TO_GOLD) {
_buttons[8]._bounds.moveTo(148, _buttons[8]._bounds.top);
@@ -94,174 +99,177 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
screen._windows[29].writeString(msg);
drawButtons(&screen);
- }
- Common::StringArray lines;
- int arr[40];
- Common::fill(&arr[0], &arr[40], 0);
- int var2 = -1;
-
- if (mode == ITEMMODE_CHAR_INFO || category != 3) {
- _iconSprites.draw(screen, 8, Common::Point(148, 109));
- }
- if (mode != ITEMMODE_ENCHANT && mode != ITEMMODE_RECHARGE && mode != ITEMMODE_TO_GOLD) {
- _iconSprites.draw(screen, 10, Common::Point(182, 109));
- _iconSprites.draw(screen, 12, Common::Point(216, 109));
- _iconSprites.draw(screen, 14, Common::Point(250, 109));
+ Common::fill(&arr[0], &arr[40], 0);
+ itemIndex = -1;
}
- switch (mode) {
- case ITEMMODE_CHAR_INFO:
- _iconSprites.draw(screen, 9, Common::Point(148, 109));
- break;
- case ITEMMODE_BLACKSMITH:
- _iconSprites.draw(screen, 11, Common::Point(182, 109));
- break;
- case ITEMMODE_REPAIR:
- _iconSprites.draw(screen, 15, Common::Point(250, 109));
- break;
- case ITEMMODE_IDENTIFY:
- _iconSprites.draw(screen, 13, Common::Point(216, 109));
- break;
- default:
- break;
- }
+ if (redrawFlag == REDRAW_TEXT || redrawFlag == REDRAW_FULL) {
+ lines.clear();
- for (int idx = 0; idx < 9; ++idx) {
- _itemsDrawList[idx]._y = 10 + idx * 9;
+ if (mode == ITEMMODE_CHAR_INFO || category != 3) {
+ _iconSprites.draw(screen, 8, Common::Point(148, 109));
+ }
+ if (mode != ITEMMODE_ENCHANT && mode != ITEMMODE_RECHARGE && mode != ITEMMODE_TO_GOLD) {
+ _iconSprites.draw(screen, 10, Common::Point(182, 109));
+ _iconSprites.draw(screen, 12, Common::Point(216, 109));
+ _iconSprites.draw(screen, 14, Common::Point(250, 109));
+ }
- switch (category) {
- case CATEGORY_WEAPON:
- case CATEGORY_ARMOR:
- case CATEGORY_ACCESSORY: {
- XeenItem &i = (category == CATEGORY_WEAPON) ? c->_weapons[idx] :
- ((category == CATEGORY_ARMOR) ? c->_armor[idx] : c->_accessories[idx]);
-
- if (i._id) {
- if (mode == ITEMMODE_CHAR_INFO || mode == ITEMMODE_8
- || mode == ITEMMODE_ENCHANT || mode == ITEMMODE_RECHARGE) {
- lines.push_back(Common::String::format(ITEMS_DIALOG_LINE1,
- arr[idx], idx + 1,
- c->_items[category].getFullDescription(idx, arr[idx])));
+ switch (mode) {
+ case ITEMMODE_CHAR_INFO:
+ _iconSprites.draw(screen, 9, Common::Point(148, 109));
+ break;
+ case ITEMMODE_BLACKSMITH:
+ _iconSprites.draw(screen, 11, Common::Point(182, 109));
+ break;
+ case ITEMMODE_REPAIR:
+ _iconSprites.draw(screen, 15, Common::Point(250, 109));
+ break;
+ case ITEMMODE_IDENTIFY:
+ _iconSprites.draw(screen, 13, Common::Point(216, 109));
+ break;
+ default:
+ break;
+ }
+
+ for (int idx = 0; idx < 9; ++idx) {
+ _itemsDrawList[idx]._y = 10 + idx * 9;
+
+ switch (category) {
+ case CATEGORY_WEAPON:
+ case CATEGORY_ARMOR:
+ case CATEGORY_ACCESSORY: {
+ XeenItem &i = (category == CATEGORY_WEAPON) ? c->_weapons[idx] :
+ ((category == CATEGORY_ARMOR) ? c->_armor[idx] : c->_accessories[idx]);
+
+ if (i._id) {
+ if (mode == ITEMMODE_CHAR_INFO || mode == ITEMMODE_8
+ || mode == ITEMMODE_ENCHANT || mode == ITEMMODE_RECHARGE) {
+ lines.push_back(Common::String::format(ITEMS_DIALOG_LINE1,
+ arr[idx], idx + 1,
+ c->_items[category].getFullDescription(idx, arr[idx])));
+ } else {
+ lines.push_back(Common::String::format(ITEMS_DIALOG_LINE2,
+ arr[idx], idx + 1,
+ c->_items[category].getFullDescription(idx, arr[idx]),
+ calcItemCost(c, idx, mode,
+ mode == ITEMMODE_TO_GOLD ? 1 : startingChar->_skills[MERCHANT],
+ category)
+ ));
+ }
+
+ DrawStruct &ds = _itemsDrawList[idx];
+ ds._sprites = &_equipSprites;
+ if (c->_weapons.passRestrictions(i._id, true))
+ ds._frame = i._frame;
+ else
+ ds._frame = 14;
+ } else if (_itemsDrawList[idx]._sprites == nullptr) {
+ lines.push_back(NO_ITEMS_AVAILABLE);
+ }
+ break;
+ }
+
+ case CATEGORY_MISC: {
+ XeenItem &i = c->_misc[idx];
+ _itemsDrawList[idx]._sprites = nullptr;
+
+ if (i._material == 0) {
+ // No item
+ if (idx == 0) {
+ lines.push_back(NO_ITEMS_AVAILABLE);
+ }
} else {
+ ItemsMode tempMode = mode;
+ int skill = startingChar->_skills[MERCHANT];
+
+ if (mode == ITEMMODE_CHAR_INFO || mode == ITEMMODE_8
+ || mode == ITEMMODE_ENCHANT || mode == ITEMMODE_RECHARGE) {
+ tempMode = ITEMMODE_ENCHANT;
+ } else if (mode == ITEMMODE_TO_GOLD) {
+ skill = 1;
+ }
+
lines.push_back(Common::String::format(ITEMS_DIALOG_LINE2,
arr[idx], idx + 1,
c->_items[category].getFullDescription(idx, arr[idx]),
- calcItemCost(c, idx, mode,
- mode == ITEMMODE_TO_GOLD ? 1 : startingChar->_skills[MERCHANT],
- category)
+ calcItemCost(c, idx, tempMode, skill, category)
));
}
+ break;
+ }
- DrawStruct &ds = _itemsDrawList[idx];
- ds._sprites = &_equipSprites;
- if (c->_weapons.passRestrictions(i._id, true))
- ds._frame = i._frame;
- else
- ds._frame = 14;
- } else if (_itemsDrawList[idx]._sprites == nullptr) {
- lines.push_back(NO_ITEMS_AVAILABLE);
+ default:
+ break;
}
- break;
}
+ while (lines.size() < INV_ITEMS_TOTAL)
+ lines.push_back("");
- case CATEGORY_MISC: {
- XeenItem &i = c->_misc[idx];
- _itemsDrawList[idx]._sprites = nullptr;
+ // Draw out overall text and the list of items
+ switch (mode) {
+ case ITEMMODE_CHAR_INFO:
+ case ITEMMODE_8:
+ screen._windows[30].writeString(Common::String::format(X_FOR_THE_Y,
+ category == CATEGORY_MISC ? "\x3l" : "\x3c",
+ CATEGORY_NAMES[category], c->_name.c_str(), CLASS_NAMES[c->_class],
+ category == CATEGORY_MISC ? FMT_CHARGES : " ",
+ lines[0].c_str(), lines[1].c_str(), lines[2].c_str(), lines[3].c_str(),
+ lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(),
+ lines[8].c_str()
+ ));
- if (i._material == 0) {
- // No item
- if (idx == 0) {
- lines.push_back(NO_ITEMS_AVAILABLE);
- }
- } else {
- ItemsMode tempMode = mode;
- int skill = startingChar->_skills[MERCHANT];
-
- if (mode == ITEMMODE_CHAR_INFO || mode == ITEMMODE_8
- || mode == ITEMMODE_ENCHANT || mode == ITEMMODE_RECHARGE) {
- tempMode = ITEMMODE_ENCHANT;
- } else if (mode == ITEMMODE_TO_GOLD) {
- skill = 1;
- }
+ case ITEMMODE_BLACKSMITH: {
+ // Original uses var in this block that's never set?!
+ const int v1 = 0;
+ screen._windows[30].writeString(Common::String::format(AVAILABLE_GOLD_COST,
+ CATEGORY_NAMES[category],
+ v1 ? "" : "s", party._gold,
+ lines[0].c_str(), lines[1].c_str(), lines[2].c_str(), lines[3].c_str(),
+ lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(),
+ lines[8].c_str()
+ ));
+ break;
+ }
+
+ case ITEMMODE_2:
+ case ITEMMODE_RECHARGE:
+ case ITEMMODE_ENCHANT:
+ case ITEMMODE_REPAIR:
+ case ITEMMODE_IDENTIFY:
+ case ITEMMODE_TO_GOLD:
+ screen._windows[30].writeString(Common::String::format(X_FOR_Y,
+ CATEGORY_NAMES[category], startingChar->_name.c_str(),
+ (mode == ITEMMODE_RECHARGE || mode == ITEMMODE_ENCHANT) ? CHARGES : COST,
+ lines[0].c_str(), lines[1].c_str(), lines[2].c_str(), lines[3].c_str(),
+ lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(),
+ lines[8].c_str()
+ ));
+ break;
- lines.push_back(Common::String::format(ITEMS_DIALOG_LINE2,
- arr[idx], idx + 1,
- c->_items[category].getFullDescription(idx, arr[idx]),
- calcItemCost(c, idx, tempMode, skill, category)
+ case ITEMMODE_3:
+ case ITEMMODE_5:
+ screen._windows[30].writeString(Common::String::format(X_FOR_Y_GOLD,
+ CATEGORY_NAMES[category], c->_name.c_str(), party._gold, CHARGES,
+ lines[0].c_str(), lines[1].c_str(), lines[2].c_str(), lines[3].c_str(),
+ lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(),
+ lines[8].c_str()
));
- }
break;
- }
default:
break;
}
- }
- while (lines.size() < INV_ITEMS_TOTAL)
- lines.push_back("");
-
- // Draw out overall text and the list of items
- switch (mode) {
- case ITEMMODE_CHAR_INFO:
- case ITEMMODE_8:
- screen._windows[30].writeString(Common::String::format(X_FOR_THE_Y,
- category == CATEGORY_MISC ? "\x3l" : "\x3c",
- CATEGORY_NAMES[category], c->_name.c_str(), CLASS_NAMES[c->_class],
- category == CATEGORY_MISC ? FMT_CHARGES : " ",
- lines[0].c_str(), lines[1].c_str(), lines[2].c_str(), lines[3].c_str(),
- lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(),
- lines[8].c_str()
- ));
-
- case ITEMMODE_BLACKSMITH: {
- // Original uses var in this block that's never set?!
- const int v1 = 0;
- screen._windows[30].writeString(Common::String::format(AVAILABLE_GOLD_COST,
- CATEGORY_NAMES[category],
- v1 ? "" : "s", party._gold,
- lines[0].c_str(), lines[1].c_str(), lines[2].c_str(), lines[3].c_str(),
- lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(),
- lines[8].c_str()
- ));
- break;
- }
-
- case ITEMMODE_2:
- case ITEMMODE_RECHARGE:
- case ITEMMODE_ENCHANT:
- case ITEMMODE_REPAIR:
- case ITEMMODE_IDENTIFY:
- case ITEMMODE_TO_GOLD:
- screen._windows[30].writeString(Common::String::format(X_FOR_Y,
- CATEGORY_NAMES[category], startingChar->_name.c_str(),
- (mode == ITEMMODE_RECHARGE || mode == ITEMMODE_ENCHANT) ? CHARGES : COST,
- lines[0].c_str(), lines[1].c_str(), lines[2].c_str(), lines[3].c_str(),
- lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(),
- lines[8].c_str()
- ));
- break;
-
- case ITEMMODE_3:
- case ITEMMODE_5:
- screen._windows[30].writeString(Common::String::format(X_FOR_Y_GOLD,
- CATEGORY_NAMES[category], c->_name.c_str(), party._gold, CHARGES,
- lines[0].c_str(), lines[1].c_str(), lines[2].c_str(), lines[3].c_str(),
- lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(),
- lines[8].c_str()
- ));
- break;
- default:
- break;
+ // Draw the glyphs for the items
+ screen._windows[0].drawList(_itemsDrawList, INV_ITEMS_TOTAL);
+ screen._windows[0].update();
}
- // Draw the glyphs for the items
- screen._windows[0].drawList(_itemsDrawList, INV_ITEMS_TOTAL);
- screen._windows[0].update();
+ redrawFlag = REDRAW_NONE;
- if (var2 != -1) {
- int actionIndex = -1;
+ if (itemIndex != -1) {
switch (mode) {
case ITEMMODE_BLACKSMITH:
actionIndex = 0;
@@ -278,15 +286,229 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
default:
break;
}
-
- if (actionIndex >= 0) {
- doItemOptions(*c, actionIndex, var2, category, mode);
+ }
+
+ // If it's time to do an item action, take care of it
+ if (actionIndex >= 0) {
+ int result = doItemOptions(*c, actionIndex, itemIndex, category, mode);
+ if (result == 1) {
+ // Finish dialog with no selected character
+ c = nullptr;
+ break;
+ } else if (result == 2) {
+ // Close dialogs and finish dialog with original starting character
+ screen._windows[30].close();
+ screen._windows[29].close();
+ c = startingChar;
+ break;
}
+
+ // Otherwise, result and continue showing dialog
+ actionIndex = -1;
+ }
+
+ // Wait for a selection
+ _buttonValue = 0;
+ while (!_vm->shouldQuit() && !_buttonValue) {
+ events.pollEventsAndWait();
+ checkEvents(_vm);
}
+ if (_vm->shouldQuit())
+ return nullptr;
+
+ // Handle escaping out of dialog
+ if (_buttonValue == Common::KEYCODE_ESCAPE) {
+ if (mode == ITEMMODE_8)
+ continue;
+ break;
+ }
+
+ // Handle other selections
+ switch (_buttonValue) {
+ case Common::KEYCODE_F1:
+ case Common::KEYCODE_F2:
+ case Common::KEYCODE_F3:
+ case Common::KEYCODE_F4:
+ case Common::KEYCODE_F5:
+ case Common::KEYCODE_F6:
+ if (!varA && mode != ITEMMODE_3 && mode != ITEMMODE_ENCHANT
+ && mode != ITEMMODE_RECHARGE && mode != ITEMMODE_TO_GOLD
+ && party._mazeId != 0) {
+ _buttonValue -= Common::KEYCODE_F1;
+
+ if (_buttonValue < (int)(_vm->_mode == MODE_InCombat ?
+ party._combatParty.size() : party._activeParty.size())) {
+ // Character number is valid
+ redrawFlag = REDRAW_TEXT;
+ Character *newChar = _vm->_mode == MODE_InCombat ?
+ party._combatParty[_buttonValue] : &party._activeParty[_buttonValue];
+
+ if (mode == ITEMMODE_BLACKSMITH) {
+ _oldCharacter = newChar;
+ startingChar = newChar;
+ c = &_itemsCharacter;
+ } else if (mode != ITEMMODE_2 && mode != ITEMMODE_REPAIR
+ && mode != ITEMMODE_IDENTIFY && itemIndex != -1) {
+ InventoryItems &destItems = newChar->_items[category];
+ XeenItem &destItem = destItems[INV_ITEMS_TOTAL - 1];
+ InventoryItems &srcItems = c->_items[category];
+ XeenItem &srcItem = srcItems[itemIndex];
+
+ if (srcItem._bonusFlags & ITEMFLAG_CURSED)
+ ErrorScroll::show(_vm, CANNOT_REMOVE_CURSED_ITEM);
+ else if (destItems[INV_ITEMS_TOTAL - 1]._id)
+ ErrorScroll::show(_vm, Common::String::format(
+ CATEGORY_BACKPACK_IS_FULL[category], c->_name.c_str()));
+ else {
+ destItem = srcItem;
+ srcItem.clear();
+ destItem._frame = 0;
+
+ srcItems.sort();
+ destItems.sort();
+ }
+
+ continue;
+ }
+
+ c = newChar;
+ startingChar = newChar;
+ intf.highlightChar(_buttonValue);
+ }
+ }
+ break;
+
+ case Common::KEYCODE_1:
+ case Common::KEYCODE_2:
+ case Common::KEYCODE_3:
+ case Common::KEYCODE_4:
+ case Common::KEYCODE_5:
+ case Common::KEYCODE_6:
+ case Common::KEYCODE_7:
+ case Common::KEYCODE_8:
+ case Common::KEYCODE_9:
+ // Select an item
+ if (mode == ITEMMODE_3)
+ break;
+
+ _buttonValue -= Common::KEYCODE_1;
+ if (_buttonValue != itemIndex) {
+ // Check whether the new selection has an associated item
+ if (!c->_items[category][_buttonValue].empty()) {
+ itemIndex = _buttonValue;
+ Common::fill(&arr[0], &arr[40], 0);
+ arr[itemIndex] = 15;
+ }
+
+ redrawFlag = REDRAW_TEXT;
+ }
+ break;
+
+ case Common::KEYCODE_a:
+ // Armor category
+ category = CATEGORY_ARMOR;
+ redrawFlag = REDRAW_FULL;
+ break;
- // TODO
+ case Common::KEYCODE_b:
+ // Buy
+ if (mode != ITEMMODE_CHAR_INFO && mode != ITEMMODE_RECHARGE &&
+ mode != ITEMMODE_ENCHANT && mode != ITEMMODE_TO_GOLD) {
+ mode = ITEMMODE_BLACKSMITH;
+ c = &_itemsCharacter;
+ redrawFlag = REDRAW_FULL;
+ }
+ break;
+
+ case Common::KEYCODE_c:
+ // Accessories category
+ category = CATEGORY_ACCESSORY;
+ redrawFlag = REDRAW_FULL;
+ break;
+
+ case Common::KEYCODE_d:
+ if (mode == ITEMMODE_CHAR_INFO)
+ actionIndex = 3;
+ break;
+
+ case Common::KEYCODE_e:
+ if (mode == ITEMMODE_CHAR_INFO || mode == ITEMMODE_ENCHANT ||
+ mode == ITEMMODE_TO_GOLD) {
+ if (category != CATEGORY_MISC) {
+ actionIndex = mode == ITEMMODE_ENCHANT ? 4 : 0;
+ }
+ }
+ break;
+
+ case Common::KEYCODE_f:
+ if (mode != ITEMMODE_CHAR_INFO && mode != ITEMMODE_RECHARGE &&
+ mode != ITEMMODE_ENCHANT && mode != ITEMMODE_TO_GOLD) {
+ mode = ITEMMODE_REPAIR;
+ c = startingChar;
+ redrawFlag = REDRAW_TEXT;
+ }
+ break;
+
+ case Common::KEYCODE_g:
+ if (mode == ITEMMODE_TO_GOLD)
+ actionIndex = 6;
+ break;
+
+ case Common::KEYCODE_i:
+ if (mode != ITEMMODE_CHAR_INFO && mode != ITEMMODE_RECHARGE &&
+ mode != ITEMMODE_ENCHANT && mode != ITEMMODE_TO_GOLD) {
+ mode = ITEMMODE_IDENTIFY;
+ c = startingChar;
+ redrawFlag = REDRAW_TEXT;
+ }
+ break;
+
+ case Common::KEYCODE_n:
+ // Misc category
+ category = CATEGORY_MISC;
+ redrawFlag = REDRAW_TEXT;
+ break;
+
+ case Common::KEYCODE_q:
+ if (mode == ITEMMODE_CHAR_INFO) {
+ Quests::show(_vm);
+ redrawFlag = REDRAW_TEXT;
+ }
+ break;
+
+ case Common::KEYCODE_r:
+ if (mode == ITEMMODE_CHAR_INFO)
+ actionIndex = 1;
+ else if (mode == ITEMMODE_RECHARGE)
+ actionIndex = 5;
+ break;
+
+ case Common::KEYCODE_s:
+ if (mode != ITEMMODE_CHAR_INFO && mode != ITEMMODE_RECHARGE &&
+ mode != ITEMMODE_ENCHANT && mode != ITEMMODE_TO_GOLD) {
+ mode = ITEMMODE_2;
+ c = startingChar;
+ redrawFlag = REDRAW_TEXT;
+ }
+ break;
+
+ case Common::KEYCODE_u:
+ if (mode == ITEMMODE_CHAR_INFO && category == CATEGORY_MISC)
+ actionIndex = 2;
+ break;
+
+ case Common::KEYCODE_w:
+ // Weapons category
+ category = CATEGORY_WEAPON;
+ redrawFlag = REDRAW_TEXT;
+ break;
+ }
}
+ intf.charIconsPrint(true);
+ if (updateStock)
+ charData2BlackData();
+
return c;
}
@@ -379,6 +601,27 @@ void ItemsDialog::blackData2CharData() {
}
/**
+* Saves the inventory from the temporary _itemsCharacter character back into the
+* blacksmith storage, so changes in blacksmith inventory remain persistent
+*/
+void ItemsDialog::charData2BlackData() {
+ Party &party = *_vm->_party;
+ bool isDarkCc = _vm->_files->_isDarkCc;
+ int slotIndex = 0;
+ while (party._mazeId != (int)BLACKSMITH_MAP_IDS[isDarkCc][slotIndex] && slotIndex < 4)
+ ++slotIndex;
+ if (slotIndex == 4)
+ slotIndex = 0;
+
+ for (int idx = 0; idx < INV_ITEMS_TOTAL; ++idx) {
+ party._blacksmithWeapons[isDarkCc][idx] = _itemsCharacter._weapons[idx];
+ party._blacksmithArmor[isDarkCc][idx] = _itemsCharacter._armor[idx];
+ party._blacksmithAccessories[isDarkCc][idx] = _itemsCharacter._accessories[idx];
+ party._blacksmithMisc[isDarkCc][idx] = _itemsCharacter._misc[idx];
+ }
+}
+
+/**
* Sets the equipment icon to use for each item for display
*/
void ItemsDialog::setEquipmentIcons() {
diff --git a/engines/xeen/dialogs_items.h b/engines/xeen/dialogs_items.h
index 77b1540fbe..bc995c52f8 100644
--- a/engines/xeen/dialogs_items.h
+++ b/engines/xeen/dialogs_items.h
@@ -53,6 +53,8 @@ private:
void blackData2CharData();
+ void charData2BlackData();
+
void setEquipmentIcons();
int calcItemCost(Character *c, int itemIndex, ItemsMode mode, int skillLevel,
diff --git a/engines/xeen/dialogs_quests.cpp b/engines/xeen/dialogs_quests.cpp
new file mode 100644
index 0000000000..27657193b8
--- /dev/null
+++ b/engines/xeen/dialogs_quests.cpp
@@ -0,0 +1,40 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+#include "xeen/dialogs_quests.h"
+#include "xeen/events.h"
+#include "xeen/xeen.h"
+
+namespace Xeen {
+
+void Quests::show(XeenEngine *vm) {
+ Quests *dlg = new Quests(vm);
+ dlg->execute();
+ delete dlg;
+}
+
+void Quests::execute() {
+ // TODO
+}
+
+} // End of namespace Xeen
diff --git a/engines/xeen/dialogs_quests.h b/engines/xeen/dialogs_quests.h
new file mode 100644
index 0000000000..fb39d3ace9
--- /dev/null
+++ b/engines/xeen/dialogs_quests.h
@@ -0,0 +1,43 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef XEEN_DIALOGS_QUESTS_H
+#define XEEN_DIALOGS_QUESTS_H
+
+#include "xeen/dialogs.h"
+
+namespace Xeen {
+
+class Quests : public ButtonContainer {
+private:
+ XeenEngine *_vm;
+
+ Quests(XeenEngine *vm) : ButtonContainer(), _vm(vm) {}
+
+ void execute();
+public:
+ static void show(XeenEngine *vm);
+};
+
+} // End of namespace Xeen
+
+#endif /* XEEN_DIALOGS_QUESTS_H */
diff --git a/engines/xeen/module.mk b/engines/xeen/module.mk
index 6a36f91bf8..8c526b4e46 100644
--- a/engines/xeen/module.mk
+++ b/engines/xeen/module.mk
@@ -19,6 +19,7 @@ MODULE_OBJS := \
dialogs_input.o \
dialogs_items.o \
dialogs_query.o \
+ dialogs_quests.o \
dialogs_quick_ref.o \
dialogs_spells.o \
dialogs_whowill.o \
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index 55060c8743..991c43018d 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -1240,6 +1240,13 @@ const char *const PERMANENTLY_DISCARD = "\v000\t000\x03lPermanently discard %s\f
const char *const BACKPACK_IS_FULL = "\v005\x03c\fd%s's backpack is full.";
+const char *const CATEGORY_BACKPACK_IS_FULL[4] = {
+ "\v010\t000\x3""c%s's weapons backpack is full.",
+ "\v010\t000\x3""c%s's armor backpack is full.",
+ "\v010\t000\x3""c%s's accessories backpack is full.",
+ "\v010\t000\x3""c%s's miscellaneous backpack is full."
+};
+
const char *const BUY_X_FOR_Y_GOLD = "\x3l\v000\t000\fdBuy %s\fd for %lu gold?";
const char *const SELL_X_FOR_Y_GOLD = "\x3l\v000\t000\fdSell %s\fd for %lu gold?";
diff --git a/engines/xeen/resources.h b/engines/xeen/resources.h
index cab2af7c43..4c79a1ea27 100644
--- a/engines/xeen/resources.h
+++ b/engines/xeen/resources.h
@@ -443,6 +443,8 @@ extern const char *const PERMANENTLY_DISCARD;
extern const char *const BACKPACK_IS_FULL;
+extern const char *const CATEGORY_BACKPACK_IS_FULL[4];
+
extern const char *const BUY_X_FOR_Y_GOLD;
extern const char *const SELL_X_FOR_Y_GOLD;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-03 20:30:14 +0000