diff options
| author | Strangerke | 2016-09-14 21:27:09 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-14 21:27:09 +0200 |
| commit | 20a27fac631babb7c41a5ba90b0159c23eeb040b (patch) | |
| tree | a048f9bff024a776c2277bf0e9d2a604acb496cc /engines/dm/projexpl.cpp | |
| parent | 028576cdc82933e1112bb68ea52eee6908fafccf (diff) | |
| download | scummvm-rg350-20a27fac631babb7c41a5ba90b0159c23eeb040b.tar.gz scummvm-rg350-20a27fac631babb7c41a5ba90b0159c23eeb040b.tar.bz2 scummvm-rg350-20a27fac631babb7c41a5ba90b0159c23eeb040b.zip | |
DM: Add DoorState enum, make use of it
Diffstat (limited to 'engines/dm/projexpl.cpp')
| -rw-r--r-- | engines/dm/projexpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp index ab521446f8..bd4cd6c69b 100644 --- a/engines/dm/projexpl.cpp +++ b/engines/dm/projexpl.cpp @@ -116,13 +116,13 @@ bool ProjExpl::hasProjectileImpactOccurred(int16 impactType, int16 mapXCombo, in byte curSquare = _vm->_dungeonMan->_currMapData[projectileTargetMapX][projectileTargetMapY]; int16 curDoorState = Square(curSquare).getDoorState(); Door *curDoor = (Door *)_vm->_dungeonMan->getSquareFirstThingData(projectileTargetMapX, projectileTargetMapY); - if ((curDoorState != k5_doorState_DESTROYED) && (projectileAssociatedThing == Thing::_explOpenDoor)) { + if ((curDoorState != kDMDoorStateDestroyed) && (projectileAssociatedThing == Thing::_explOpenDoor)) { if (curDoor->hasButton()) _vm->_moveSens->addEvent(k10_TMEventTypeDoor, projectileTargetMapX, projectileTargetMapY, kDMCellNorthWest, kDMSensorEffectToggle, _vm->_gameTime + 1); break; } - if ((curDoorState == k5_doorState_DESTROYED) || (curDoorState <= k1_doorState_FOURTH)) + if ((curDoorState == kDMDoorStateDestroyed) || (curDoorState <= kDMDoorStateOneFourth)) return false; DoorInfo curDoorInfo = _vm->_dungeonMan->_currMapDoorInfo[curDoor->getType()]; |