aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/projexpl.cpp
diff options
context:
space:
mode:
authorStrangerke2016-08-20 10:36:28 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commit705e906698505e8a547ef46c8a2fc65e3f48a49b (patch)
treeaa31e2354895391d791045b4ddf52dc2c558c22f /engines/dm/projexpl.cpp
parent58d1bcc3e7f7aca20b1db3bef019f742ebd6c474 (diff)
downloadscummvm-rg350-705e906698505e8a547ef46c8a2fc65e3f48a49b.tar.gz
scummvm-rg350-705e906698505e8a547ef46c8a2fc65e3f48a49b.tar.bz2
scummvm-rg350-705e906698505e8a547ef46c8a2fc65e3f48a49b.zip
DM: Some renaming, move some globals to class member
Diffstat (limited to 'engines/dm/projexpl.cpp')
-rw-r--r--engines/dm/projexpl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp
index 5e21cbd94f..95e3165907 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(_vm->_dungeonMan->g237_ObjectInfo[_vm->_dungeonMan->f141_getObjectInfoIndex(L0486_T_ProjectileAssociatedThing)].getAllowedSlots(), k0x0100_ObjectAllowedSlotPouchPassAndThroughDoors)
+ getFlag(_vm->_dungeonMan->_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))))