diff options
| author | Strangerke | 2016-09-18 11:18:11 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-18 11:18:11 +0200 |
| commit | ebe014f4be5ef81c95b8c2bdae7928b18ce61c1c (patch) | |
| tree | c2e62cab67074430d48d45bde4113e541f79bfd8 /engines/dm/timeline.cpp | |
| parent | a6d71c941d9ee2c63f7af6f447862c172544f843 (diff) | |
| download | scummvm-rg350-ebe014f4be5ef81c95b8c2bdae7928b18ce61c1c.tar.gz scummvm-rg350-ebe014f4be5ef81c95b8c2bdae7928b18ce61c1c.tar.bz2 scummvm-rg350-ebe014f4be5ef81c95b8c2bdae7928b18ce61c1c.zip | |
DM: Rename Creature masks, move SoundMode to sound.h
Diffstat (limited to 'engines/dm/timeline.cpp')
| -rw-r--r-- | engines/dm/timeline.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp index c502481483..8c3f11c288 100644 --- a/engines/dm/timeline.cpp +++ b/engines/dm/timeline.cpp @@ -410,7 +410,7 @@ void Timeline::processEventDoorAnimation(TimelineEvent *event) { } Thing groupThing = _vm->_groupMan->groupGetThing(mapX, mapY); uint16 creatureAttributes = _vm->_dungeonMan->getCreatureAttributes(groupThing); - if ((groupThing != Thing::_endOfList) && !getFlag(creatureAttributes, k0x0040_MaskCreatureInfo_nonMaterial)) { + if ((groupThing != Thing::_endOfList) && !getFlag(creatureAttributes, kDMCreatureMaskNonMaterial)) { if (doorState >= (verticalDoorFl ? CreatureInfo::getHeight(creatureAttributes) : 1)) { /* Creature height or 1 */ if (_vm->_groupMan->getDamageAllCreaturesOutcome((Group *)_vm->_dungeonMan->getThingData(groupThing), mapX, mapY, 5, true) != k2_outcomeKilledAllCreaturesInGroup) _vm->_groupMan->processEvents29to41(mapX, mapY, kM3_TMEventTypeCreateReactionEvent29DangerOnSquare, 0); @@ -460,7 +460,7 @@ void Timeline::processEventSquareFakewall(TimelineEvent *event) { addEventGetEventIndex(event); } else { Thing groupThing = _vm->_groupMan->groupGetThing(mapX, mapY); - if ((groupThing != Thing::_endOfList) && !getFlag(_vm->_dungeonMan->getCreatureAttributes(groupThing), k0x0040_MaskCreatureInfo_nonMaterial)) { + if ((groupThing != Thing::_endOfList) && !getFlag(_vm->_dungeonMan->getCreatureAttributes(groupThing), kDMCreatureMaskNonMaterial)) { event->_mapTime++; addEventGetEventIndex(event); } else |