From ebe014f4be5ef81c95b8c2bdae7928b18ce61c1c Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 18 Sep 2016 11:18:11 +0200 Subject: DM: Rename Creature masks, move SoundMode to sound.h --- engines/dm/movesens.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/dm/movesens.cpp') diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp index ee9b9e9788..b80f006e8c 100644 --- a/engines/dm/movesens.cpp +++ b/engines/dm/movesens.cpp @@ -487,7 +487,7 @@ bool MovesensMan::isLevitating(Thing thing) { ThingType thingType = thing.getType(); bool retVal = false; if (thingType == kDMThingTypeGroup) - retVal = getFlag(_vm->_dungeonMan->getCreatureAttributes(thing), k0x0020_MaskCreatureInfo_levitation); + retVal = getFlag(_vm->_dungeonMan->getCreatureAttributes(thing), kDMCreatureMaskLevitation); else if ((thingType == kDMThingTypeProjectile) || (thingType == kDMThingTypeExplosion)) // Fix original bug involving explosions falling in pits retVal = true; @@ -655,7 +655,7 @@ int16 MovesensMan::getTeleporterRotatedGroupResult(Teleporter *teleporter, Thing uint16 updatedGroupCells = _vm->_groupMan->getGroupCells(group, mapIndex); if (updatedGroupCells != k255_CreatureTypeSingleCenteredCreature) { int16 groupCells = updatedGroupCells; - int16 creatureSize = getFlag(_vm->_dungeonMan->_creatureInfos[group->_type]._attributes, k0x0003_MaskCreatureInfo_size); + int16 creatureSize = getFlag(_vm->_dungeonMan->_creatureInfos[group->_type]._attributes, kDMCreatureMaskSize); int16 relativeRotation = _vm->normalizeModulo4(4 + updatedGroupDirections - groupDirections); for (int16 creatureIdx = 0; creatureIdx <= group->getCount(); creatureIdx++) { updatedGroupDirections = _vm->_groupMan->getGroupValueUpdatedWithCreatureValue(updatedGroupDirections, creatureIdx, absoluteRotation ? (uint16)rotation : _vm->normalizeModulo4(groupDirections + rotation)); -- cgit v1.2.3