diff options
| author | Strangerke | 2016-09-12 21:48:16 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-12 21:48:16 +0200 |
| commit | ce6d3fed8f6e30f9a2ce84340e4d572c82bf6016 (patch) | |
| tree | 0b0d04bcc396ce1a4246b49c6e9d82ec8787c0bd /engines/dm/timeline.cpp | |
| parent | 5e9363b6d98f3323956fe9838488b5416342d48b (diff) | |
| download | scummvm-rg350-ce6d3fed8f6e30f9a2ce84340e4d572c82bf6016.tar.gz scummvm-rg350-ce6d3fed8f6e30f9a2ce84340e4d572c82bf6016.tar.bz2 scummvm-rg350-ce6d3fed8f6e30f9a2ce84340e4d572c82bf6016.zip | |
DM: Use SensorEffect in two functions
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 fce768dff2..6d854d1ab4 100644 --- a/engines/dm/timeline.cpp +++ b/engines/dm/timeline.cpp @@ -599,7 +599,7 @@ void Timeline::processEventSquareWall(TimelineEvent *event) { int16 triggerSetEffect = ((curSensorData == 0) != curThingSensor->getAttrRevertEffectA()); _vm->_moveSens->triggerEffect(curThingSensor, triggerSetEffect ? kDMSensorEffectSet : kDMSensorEffectClear, mapX, mapY, curCell); } else if (curSensorData == 0) - _vm->_moveSens->triggerEffect(curThingSensor, curThingSensor->getAttrEffectA(), mapX, mapY, curCell); + _vm->_moveSens->triggerEffect(curThingSensor, (SensorEffect)curThingSensor->getAttrEffectA(), mapX, mapY, curCell); } } else if (curSensorType == kDMSensorWallAndOrGate) { int16 bitMask = 1 << (event->_Cu.A._cell); @@ -618,7 +618,7 @@ void Timeline::processEventSquareWall(TimelineEvent *event) { if (curThingSensor->getAttrEffectA() == kDMSensorEffectHold) _vm->_moveSens->triggerEffect(curThingSensor, triggerSetEffect ? kDMSensorEffectSet : kDMSensorEffectClear, mapX, mapY, curCell); else if (triggerSetEffect) - _vm->_moveSens->triggerEffect(curThingSensor, curThingSensor->getAttrEffectA(), mapX, mapY, curCell); + _vm->_moveSens->triggerEffect(curThingSensor, (SensorEffect)curThingSensor->getAttrEffectA(), mapX, mapY, curCell); } else if ((((curSensorType >= kDMSensorWallSingleProjLauncherNewObj) && (curSensorType <= kDMSensorWallDoubleProjLauncherExplosion)) || (curSensorType == kDMSensorWallSingleProjLauncherSquareObj) || (curSensorType == kDMSensorWallDoubleProjLauncherSquareObj)) && (curThing.getCell() == event->_Cu.A._cell)) { triggerProjectileLauncher(curThingSensor, event); if (curThingSensor->getAttrOnlyOnce()) |