diff options
author | Strangerke | 2016-08-20 10:36:28 +0200 |
---|---|---|
committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
commit | 705e906698505e8a547ef46c8a2fc65e3f48a49b (patch) | |
tree | aa31e2354895391d791045b4ddf52dc2c558c22f /engines/dm/inventory.cpp | |
parent | 58d1bcc3e7f7aca20b1db3bef019f742ebd6c474 (diff) | |
download | scummvm-rg350-705e906698505e8a547ef46c8a2fc65e3f48a49b.tar.gz scummvm-rg350-705e906698505e8a547ef46c8a2fc65e3f48a49b.tar.bz2 scummvm-rg350-705e906698505e8a547ef46c8a2fc65e3f48a49b.zip |
DM: Some renaming, move some globals to class member
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 5552da493e..a19a71a370 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 = _vm->_dungeonMan->g237_ObjectInfo[k2_ObjectInfoIndexFirstPotion + potion->getType()].getAllowedSlots(); + actualAttribMask = _vm->_dungeonMan->_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 = _vm->_dungeonMan->g237_ObjectInfo[k127_ObjectInfoIndexFirstJunk + junk->getType()].getAllowedSlots(); + actualAttribMask = _vm->_dungeonMan->_objectInfo[k127_ObjectInfoIndexFirstJunk + junk->getType()].getAllowedSlots(); } break; } @@ -937,7 +937,7 @@ void InventoryMan::f349_processCommand70_clickOnMouth() { if (_vm->_championMan->_g299_candidateChampionOrdinal) { return; } - if (!getFlag(_vm->_dungeonMan->g237_ObjectInfo[_vm->_dungeonMan->f141_getObjectInfoIndex(L1078_T_Thing = _vm->_championMan->_g414_leaderHandObject)]._allowedSlots, k0x0001_ObjectAllowedSlotMouth)) { + if (!getFlag(_vm->_dungeonMan->_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); |