diff options
| author | Strangerke | 2016-09-13 07:46:38 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-13 07:47:47 +0200 |
| commit | f9d28464eaa484b9463e2ff35ffb54370be3e6f9 (patch) | |
| tree | 763d2d84feb7ce405bf2c8d6255b7cd8dfc0f98d /engines/dm/timeline.cpp | |
| parent | 2c105356681912685eedf753141f5316b6ff9223 (diff) | |
| download | scummvm-rg350-f9d28464eaa484b9463e2ff35ffb54370be3e6f9.tar.gz scummvm-rg350-f9d28464eaa484b9463e2ff35ffb54370be3e6f9.tar.bz2 scummvm-rg350-f9d28464eaa484b9463e2ff35ffb54370be3e6f9.zip | |
DM: Get rif od SquareType, rename SquareMask
Diffstat (limited to 'engines/dm/timeline.cpp')
| -rw-r--r-- | engines/dm/timeline.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp index 0e61a87000..7a032f12d7 100644 --- a/engines/dm/timeline.cpp +++ b/engines/dm/timeline.cpp @@ -449,7 +449,7 @@ void Timeline::processEventSquareFakewall(TimelineEvent *event) { byte *curSquare = &_vm->_dungeonMan->_currMapData[mapX][mapY]; int16 effect = event->_Cu.A._effect; if (effect == kDMSensorEffectToggle) - effect = getFlag(*curSquare, k0x0004_FakeWallOpen) ? kDMSensorEffectClear : kDMSensorEffectSet; + effect = getFlag(*curSquare, kDMSquareMaskFakeWallOpen) ? kDMSensorEffectClear : kDMSensorEffectSet; if (effect == kDMSensorEffectClear) { if ((_vm->_dungeonMan->_currMapIndex == _vm->_dungeonMan->_partyMapIndex) && (mapX == _vm->_dungeonMan->_partyMapX) && (mapY == _vm->_dungeonMan->_partyMapY)) { @@ -461,10 +461,10 @@ void Timeline::processEventSquareFakewall(TimelineEvent *event) { event->_mapTime++; addEventGetEventIndex(event); } else - clearFlag(*curSquare, k0x0004_FakeWallOpen); + clearFlag(*curSquare, kDMSquareMaskFakeWallOpen); } } else - setFlag(*curSquare, k0x0004_FakeWallOpen); + setFlag(*curSquare, kDMSquareMaskFakeWallOpen); } void Timeline::processEventDoorDestruction(TimelineEvent *event) { @@ -493,13 +493,13 @@ void Timeline::processEventSquarePit(TimelineEvent *event) { byte *square = &_vm->_dungeonMan->_currMapData[mapX][mapY]; if (event->_Cu.A._effect == kDMSensorEffectToggle) - event->_Cu.A._effect = getFlag(*square, k0x0008_PitOpen) ? kDMSensorEffectClear : kDMSensorEffectSet; + event->_Cu.A._effect = getFlag(*square, kDMSquareMaskPitOpen) ? kDMSensorEffectClear : kDMSensorEffectSet; if (event->_Cu.A._effect == kDMSensorEffectSet) { - setFlag(*square, k0x0008_PitOpen); + setFlag(*square, kDMSquareMaskPitOpen); moveTeleporterOrPitSquareThings(mapX, mapY); } else - clearFlag(*square, k0x0008_PitOpen); + clearFlag(*square, kDMSquareMaskPitOpen); } void Timeline::moveTeleporterOrPitSquareThings(uint16 mapX, uint16 mapY) { @@ -560,13 +560,13 @@ void Timeline::processEventSquareTeleporter(TimelineEvent *event) { byte *curSquare = &_vm->_dungeonMan->_currMapData[mapX][mapY]; if (event->_Cu.A._effect == kDMSensorEffectToggle) - event->_Cu.A._effect = getFlag(*curSquare, k0x0008_TeleporterOpen) ? kDMSensorEffectClear : kDMSensorEffectSet; + event->_Cu.A._effect = getFlag(*curSquare, kDMSquareMaskTeleporterOpen) ? kDMSensorEffectClear : kDMSensorEffectSet; if (event->_Cu.A._effect == kDMSensorEffectSet) { - setFlag(*curSquare, k0x0008_TeleporterOpen); + setFlag(*curSquare, kDMSquareMaskTeleporterOpen); moveTeleporterOrPitSquareThings(mapX, mapY); } else - clearFlag(*curSquare, k0x0008_TeleporterOpen); + clearFlag(*curSquare, kDMSquareMaskTeleporterOpen); } void Timeline::processEventSquareWall(TimelineEvent *event) { |