diff options
| author | Strangerke | 2016-08-25 21:17:48 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 5c81e4f4fd2ea79255e9bc635eb8ef2a93aef60c (patch) | |
| tree | ffcd683b492648b41d76923b6146d39e51007bc2 /engines/dm/eventman.cpp | |
| parent | 6a02a571cd5e8df4f70f64eace4fbce03f70faf8 (diff) | |
| download | scummvm-rg350-5c81e4f4fd2ea79255e9bc635eb8ef2a93aef60c.tar.gz scummvm-rg350-5c81e4f4fd2ea79255e9bc635eb8ef2a93aef60c.tar.bz2 scummvm-rg350-5c81e4f4fd2ea79255e9bc635eb8ef2a93aef60c.zip | |
DM: Rename functions and class members of GroupMan
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 d5d1e310a3..b627549379 100644 --- a/engines/dm/eventman.cpp +++ b/engines/dm/eventman.cpp @@ -1016,9 +1016,9 @@ void EventManager::commandMoveParty(CommandType cmdType) { if (damage) _vm->_sound->f064_SOUND_RequestPlay_CPSD(k18_soundPARTY_DAMAGED, partyMapX, partyMapY, k0_soundModePlayImmediately); } else { - isMovementBlocked = (_vm->_groupMan->f175_groupGetThing(partyMapX, partyMapY) != Thing::_endOfList); + isMovementBlocked = (_vm->_groupMan->groupGetThing(partyMapX, partyMapY) != Thing::_endOfList); if (isMovementBlocked) - _vm->_groupMan->f209_processEvents29to41(partyMapX, partyMapY, kM1_TMEventTypeCreateReactionEvent31ParyIsAdjacent, 0); + _vm->_groupMan->processEvents29to41(partyMapX, partyMapY, kM1_TMEventTypeCreateReactionEvent31ParyIsAdjacent, 0); } } @@ -1347,10 +1347,10 @@ void EventManager::processType80_clickInDungeonView_grabLeaderHandObject(uint16 int16 mapY = _vm->_dungeonMan->_partyMapY; if (viewCell >= k2_ViewCellBackRight) { mapX += _vm->_dirIntoStepCountEast[_vm->_dungeonMan->_partyDir], mapY += _vm->_dirIntoStepCountNorth[_vm->_dungeonMan->_partyDir]; - Thing groupThing = _vm->_groupMan->f175_groupGetThing(mapX, mapY); + Thing groupThing = _vm->_groupMan->groupGetThing(mapX, mapY); if ((groupThing != Thing::_endOfList) && !_vm->_moveSens->f264_isLevitating(groupThing) && - _vm->_groupMan->f176_getCreatureOrdinalInCell((Group*)_vm->_dungeonMan->getThingData(groupThing), normalizeModulo4(viewCell + _vm->_dungeonMan->_partyDir))) { + _vm->_groupMan->getCreatureOrdinalInCell((Group*)_vm->_dungeonMan->getThingData(groupThing), normalizeModulo4(viewCell + _vm->_dungeonMan->_partyDir))) { return; /* It is not possible to grab an object on floor if there is a non levitating creature on its cell */ } } |