libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 21:03:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MM: MM1: Added equip/remove to enhanced character items view

Browse Source
This commit is contained in:
Paul Gilbert 2023-03-20 20:13:32 -07:00
parent 462d002393
commit 5e39b24240
3 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
engines/mm/mm1/game/equip_remove.cpp
View File

@ -29,7 +29,7 @@ namespace Game {
bool EquipRemove::equipItem(int index, Common::Point &textPos, Common::String &equipError) {
Character &c = *g_globals->_currCharacter;
uint itemId = c._backpack[index]._id;
uint item14 = c._backpack[index]._charges;
uint charges = c._backpack[index]._charges;
int classBit = 0;
textPos.x = 0;
@ -132,7 +132,7 @@ bool EquipRemove::equipItem(int index, Common::Point &textPos, Common::String &e
if (equipError.empty()) {
// All checks passed, can equip item
c._backpack.removeAt(index);
uint freeIndex = c._equipped.add(itemId, item14);
uint freeIndex = c._equipped.add(itemId, charges);
if (item._equipMode != EQUIPMODE_0) {
if (item._equipMode == IS_EQUIPPABLE) {
@ -144,38 +144,37 @@ bool EquipRemove::equipItem(int index, Common::Point &textPos, Common::String &e
}
}
if (equipError.empty()) {
switch (getItemCategory(itemId)) {
case ITEMCAT_WEAPON:
case ITEMCAT_TWO_HANDED:
c._physicalAttr._base = item._val16;
c._physicalAttr._current = item._val17;
break;
case ITEMCAT_MISSILE:
c._missileAttr._base = item._val16;
c._missileAttr._current = item._val17;
break;
case ITEMCAT_ARMOR:
case ITEMCAT_SHIELD:
c._ac._base += item._val17;
break;
default:
break;
}
c.updateResistances();
c.updateAttributes();
c.updateAC();
if (!equipError.empty())
return false;
switch (getItemCategory(itemId)) {
case ITEMCAT_WEAPON:
case ITEMCAT_TWO_HANDED:
c._physicalAttr._base = item._val16;
c._physicalAttr._current = item._val17;
break;
case ITEMCAT_MISSILE:
c._missileAttr._base = item._val16;
c._missileAttr._current = item._val17;
break;
case ITEMCAT_ARMOR:
case ITEMCAT_SHIELD:
c._ac._base += item._val17;
break;
default:
break;
}
return false;
c.updateResistances();
c.updateAttributes();
c.updateAC();
return true;
}
bool EquipRemove::removeItem(int index, Common::Point &textPos, Common::String &removeError) {
Character &c = *g_globals->_currCharacter;
uint itemId = c._equipped[index]._id;
uint item14 = c._equipped[index]._charges;
uint charges = c._equipped[index]._charges;
g_globals->_items.getItem(itemId);
const Item &item = g_globals->_currItem;
@ -192,7 +191,7 @@ bool EquipRemove::removeItem(int index, Common::Point &textPos, Common::String &
// Shift item to backpack
c._equipped.removeAt(index);
c._backpack.add(itemId, item14);
c._backpack.add(itemId, charges);
if (item._val10) {
// TODO: _equipMode is used as a character offset. Need to

24
engines/mm/mm1/views_enh/character_inventory.cpp
View File

@ -43,7 +43,7 @@ bool CharacterInventory::msgFocus(const FocusMessage &msg) {
ItemsView::msgFocus(msg);
if (dynamic_cast<WhichItem *>(msg._priorView) == nullptr)
_mode = ARMS_MODE;
_mode = BACKPACK_MODE;
populateItems();
return true;
@ -175,11 +175,29 @@ void CharacterInventory::performAction() {
void CharacterInventory::equipItem() {
// TODO
Common::String errMsg;
Common::Point textPos;
if (EquipRemove::equipItem(_selectedItem, textPos, errMsg)) {
_mode = ARMS_MODE;
populateItems();
redraw();
} else {
displayMessage(errMsg);
}
}
void CharacterInventory::removeItem() {
// TODO
Common::String errMsg;
Common::Point textPos;
if (EquipRemove::removeItem(_selectedItem, textPos, errMsg)) {
_mode = BACKPACK_MODE;
populateItems();
redraw();
} else {
displayMessage(errMsg);
}
}
void CharacterInventory::discardItem() {

3
engines/mm/mm1/views_enh/character_inventory.h
View File

@ -23,12 +23,13 @@
#define MM1_VIEWS_ENH_CHARACTER_INVENTORY_H
#include "mm/mm1/views_enh/items_view.h"
#include "mm/mm1/game/equip_remove.h"
namespace MM {
namespace MM1 {
namespace ViewsEnh {
class CharacterInventory : public ItemsView {
class CharacterInventory : public ItemsView, Game::EquipRemove {
private:
enum DisplayMode {
ARMS_MODE, BACKPACK_MODE