diff options
| author | Strangerke | 2016-07-25 16:13:53 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | cdbbc15e5623f47a0e93e5d9113ac64b709cf6de (patch) | |
| tree | 3b015d74c35049b19500112bcf13ba23af6cb2d2 /engines/dm/menus.cpp | |
| parent | 58d82353442ff5cef4d17510a9610b87e5a0b9ee (diff) | |
| download | scummvm-rg350-cdbbc15e5623f47a0e93e5d9113ac64b709cf6de.tar.gz scummvm-rg350-cdbbc15e5623f47a0e93e5d9113ac64b709cf6de.tar.bz2 scummvm-rg350-cdbbc15e5623f47a0e93e5d9113ac64b709cf6de.zip | |
DM: Refactor f318_dropAllObjects, f319_championKill and f323_unpoison. Rename _moveSens
Diffstat (limited to 'engines/dm/menus.cpp')
| -rw-r--r-- | engines/dm/menus.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp index 54ce632590..b63717d265 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -620,7 +620,7 @@ T0412033: _vm->_championMan->f301_addObjectInSlot((ChampionIndex)champIndex, L1272_T_Object, AL1267_ui_SlotIndex);
_vm->_championMan->f292_drawChampionState((ChampionIndex)champIndex);
} else {
- _vm->_movsens->f267_getMoveResult(L1272_T_Object, kM1_MapXNotOnASquare, 0, _vm->_dungeonMan->_g306_partyMapX, _vm->_dungeonMan->_g307_partyMapY);
+ _vm->_moveSens->f267_getMoveResult(L1272_T_Object, kM1_MapXNotOnASquare, 0, _vm->_dungeonMan->_g306_partyMapX, _vm->_dungeonMan->_g307_partyMapY);
}
break;
case k8_spellType_otherFireshield:
@@ -1252,9 +1252,9 @@ T0407032: /* CHANGE6_00_FIX The presence of a group over the pit is checked so that you cannot climb down a pit with the rope if there is a group levitating over it */
if ((_vm->_dungeonMan->f151_getSquare(L1251_i_MapX, L1252_i_MapY).getType() == k2_ElementTypePit) && (_vm->_groupMan->f175_groupGetThing(L1251_i_MapX, L1252_i_MapY) == Thing::_endOfList)) {
/* BUG0_77 The party moves forward when using the rope in front of a closed pit. The engine does not check whether the pit is open before moving the party over the pit. This is not consistent with the behavior when using the rope in front of a corridor where nothing happens */
- _vm->_movsens->_g402_useRopeToClimbDownPit = true;
- _vm->_movsens->f267_getMoveResult(Thing::_party, _vm->_dungeonMan->_g306_partyMapX, _vm->_dungeonMan->_g307_partyMapY, L1251_i_MapX, L1252_i_MapY);
- _vm->_movsens->_g402_useRopeToClimbDownPit = false;
+ _vm->_moveSens->_g402_useRopeToClimbDownPit = true;
+ _vm->_moveSens->f267_getMoveResult(Thing::_party, _vm->_dungeonMan->_g306_partyMapX, _vm->_dungeonMan->_g307_partyMapY, L1251_i_MapX, L1252_i_MapY);
+ _vm->_moveSens->_g402_useRopeToClimbDownPit = false;
} else {
L1249_ui_ActionDisabledTicks = 0;
}
|