diff options
| author | Strangerke | 2016-09-12 21:56:49 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-12 21:56:49 +0200 |
| commit | 935df3b397fa2d0887b8e8afa5e044ba397f5ed3 (patch) | |
| tree | 3d3a90dc6774d6af19d214517298de2dda14439f /engines/dm/eventman.cpp | |
| parent | ce6d3fed8f6e30f9a2ce84340e4d572c82bf6016 (diff) | |
| download | scummvm-rg350-935df3b397fa2d0887b8e8afa5e044ba397f5ed3.tar.gz scummvm-rg350-935df3b397fa2d0887b8e8afa5e044ba397f5ed3.tar.bz2 scummvm-rg350-935df3b397fa2d0887b8e8afa5e044ba397f5ed3.zip | |
DM: Enforce the use of Cell enum, some renaming
Diffstat (limited to 'engines/dm/eventman.cpp')
| -rw-r--r-- | engines/dm/eventman.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp index 6f834d3c19..5d36424cac 100644 --- a/engines/dm/eventman.cpp +++ b/engines/dm/eventman.cpp @@ -1167,15 +1167,15 @@ void EventManager::commandProcessType80ClickInDungeonView(int16 posX, int16 posY if (_vm->_championMan->_leaderIndex == kDMChampionNone) return; - int16 L1155_i_MapX = _vm->_dungeonMan->_partyMapX + _vm->_dirIntoStepCountEast[_vm->_dungeonMan->_partyDir]; - int16 L1156_i_MapY = _vm->_dungeonMan->_partyMapY + _vm->_dirIntoStepCountNorth[_vm->_dungeonMan->_partyDir]; + int16 mapX = _vm->_dungeonMan->_partyMapX + _vm->_dirIntoStepCountEast[_vm->_dungeonMan->_partyDir]; + int16 mapY = _vm->_dungeonMan->_partyMapY + _vm->_dirIntoStepCountNorth[_vm->_dungeonMan->_partyDir]; if (_vm->_championMan->_leaderEmptyHanded) { - Junk *junkPtr = (Junk*)_vm->_dungeonMan->getSquareFirstThingData(L1155_i_MapX, L1156_i_MapY); + Junk *junkPtr = (Junk*)_vm->_dungeonMan->getSquareFirstThingData(mapX, mapY); if ((((Door*)junkPtr)->hasButton()) && _vm->_dungeonMan->_dungeonViewClickableBoxes[k5_ViewCellDoorButtonOrWallOrn].isPointInside(posX, posY - 33)) { _vm->_stopWaitingForPlayerInput = true; _vm->_sound->requestPlay(k01_soundSWITCH, _vm->_dungeonMan->_partyMapX, _vm->_dungeonMan->_partyMapY, k1_soundModePlayIfPrioritized); - _vm->_moveSens->addEvent(k10_TMEventTypeDoor, L1155_i_MapX, L1156_i_MapY, 0, kDMSensorEffectToggle, _vm->_gameTime + 1); + _vm->_moveSens->addEvent(k10_TMEventTypeDoor, mapX, mapY, kDMCellNorthWest, kDMSensorEffectToggle, _vm->_gameTime + 1); return; } } else if (isLeaderHandObjThrown(posX, posY)) |