diff options
| author | Strangerke | 2016-08-20 00:37:28 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | a5b8085c48f11dde20e090b063c3c9558d5f6c66 (patch) | |
| tree | 1a98a5d5000b0a6bc2e0f3eebd8e1dfd9a11ef7a /engines/dm/inventory.cpp | |
| parent | 80f2199151d2a005bbae64e9744477a5e52bfc52 (diff) | |
| download | scummvm-rg350-a5b8085c48f11dde20e090b063c3c9558d5f6c66.tar.gz scummvm-rg350-a5b8085c48f11dde20e090b063c3c9558d5f6c66.tar.bz2 scummvm-rg350-a5b8085c48f11dde20e090b063c3c9558d5f6c66.zip | |
DM: Fix regression (pressure plate), fix compilation
Diffstat (limited to 'engines/dm/inventory.cpp')
| -rw-r--r-- | engines/dm/inventory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/dm/inventory.cpp b/engines/dm/inventory.cpp index f7152277d8..5552da493e 100644 --- a/engines/dm/inventory.cpp +++ b/engines/dm/inventory.cpp @@ -587,7 +587,7 @@ void InventoryMan::f342_drawPanelObject(Thing thingToDraw, bool pressingEye) { case k8_PotionThingType: { potentialAttribMask = k0x0001_DescriptionMaskConsumable; Potion *potion = (Potion *)rawThingPtr; - actualAttribMask = g237_ObjectInfo[k2_ObjectInfoIndexFirstPotion + potion->getType()].getAllowedSlots(); + actualAttribMask = _vm->_dungeonMan->g237_ObjectInfo[k2_ObjectInfoIndexFirstPotion + potion->getType()].getAllowedSlots(); break; } case k10_JunkThingType: { @@ -630,7 +630,7 @@ void InventoryMan::f342_drawPanelObject(Thing thingToDraw, bool pressingEye) { f335_drawPanelObjectDescriptionString(str); } else { potentialAttribMask = k0x0001_DescriptionMaskConsumable; - actualAttribMask = g237_ObjectInfo[k127_ObjectInfoIndexFirstJunk + junk->getType()].getAllowedSlots(); + actualAttribMask = _vm->_dungeonMan->g237_ObjectInfo[k127_ObjectInfoIndexFirstJunk + junk->getType()].getAllowedSlots(); } break; } @@ -937,7 +937,7 @@ void InventoryMan::f349_processCommand70_clickOnMouth() { if (_vm->_championMan->_g299_candidateChampionOrdinal) { return; } - if (!getFlag(g237_ObjectInfo[_vm->_dungeonMan->f141_getObjectInfoIndex(L1078_T_Thing = _vm->_championMan->_g414_leaderHandObject)]._allowedSlots, k0x0001_ObjectAllowedSlotMouth)) { + if (!getFlag(_vm->_dungeonMan->g237_ObjectInfo[_vm->_dungeonMan->f141_getObjectInfoIndex(L1078_T_Thing = _vm->_championMan->_g414_leaderHandObject)]._allowedSlots, k0x0001_ObjectAllowedSlotMouth)) { return; } L1079_ui_IconIndex = _vm->_objectMan->f33_getIconIndex(L1078_T_Thing); |