diff options
| author | Strangerke | 2016-08-20 00:37:28 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | a5b8085c48f11dde20e090b063c3c9558d5f6c66 (patch) | |
| tree | 1a98a5d5000b0a6bc2e0f3eebd8e1dfd9a11ef7a /engines/dm/projexpl.cpp | |
| parent | 80f2199151d2a005bbae64e9744477a5e52bfc52 (diff) | |
| download | scummvm-rg350-a5b8085c48f11dde20e090b063c3c9558d5f6c66.tar.gz scummvm-rg350-a5b8085c48f11dde20e090b063c3c9558d5f6c66.tar.bz2 scummvm-rg350-a5b8085c48f11dde20e090b063c3c9558d5f6c66.zip | |
DM: Fix regression (pressure plate), fix compilation
Diffstat (limited to 'engines/dm/projexpl.cpp')
| -rw-r--r-- | engines/dm/projexpl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp index b65e03a3c6..5e21cbd94f 100644 --- a/engines/dm/projexpl.cpp +++ b/engines/dm/projexpl.cpp @@ -159,7 +159,7 @@ T0217004: ((L0510_i_ProjectileAssociatedThingType == k15_ExplosionThingType) ? (L0486_T_ProjectileAssociatedThing.toUint16() >= Thing::_explHarmNonMaterial.toUint16()) : ((L0490_ps_Projectile->_attack > _vm->getRandomNumber(128)) && - getFlag(g237_ObjectInfo[_vm->_dungeonMan->f141_getObjectInfoIndex(L0486_T_ProjectileAssociatedThing)].getAllowedSlots(), k0x0100_ObjectAllowedSlotPouchPassAndThroughDoors) + getFlag(_vm->_dungeonMan->g237_ObjectInfo[_vm->_dungeonMan->f141_getObjectInfoIndex(L0486_T_ProjectileAssociatedThing)].getAllowedSlots(), k0x0100_ObjectAllowedSlotPouchPassAndThroughDoors) && ((L0510_i_ProjectileAssociatedThingType != k10_JunkThingType) || ((AL0487_i_IconIndex = _vm->_objectMan->f33_getIconIndex(L0486_T_ProjectileAssociatedThing)) < 0) || (!((AL0487_i_IconIndex >= k176_IconIndiceJunkIronKey) && (AL0487_i_IconIndex <= k191_IconIndiceJunkMasterKey)))) |