diff options
| author | Strangerke | 2016-09-17 15:13:20 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-17 15:13:20 +0200 |
| commit | 94f1c71c08ce060bee1869552f6b219ad83fa477 (patch) | |
| tree | 210a0c5af62e18cdebe53f23804a6307699093fd /engines/dm/projexpl.cpp | |
| parent | f9590e4ef0441e2f6c4272cbd1b513c558cce711 (diff) | |
| download | scummvm-rg350-94f1c71c08ce060bee1869552f6b219ad83fa477.tar.gz scummvm-rg350-94f1c71c08ce060bee1869552f6b219ad83fa477.tar.bz2 scummvm-rg350-94f1c71c08ce060bee1869552f6b219ad83fa477.zip | |
DM: Some renaming in group
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 b30fb72dde..74b26e7e6a 100644 --- a/engines/dm/projexpl.cpp +++ b/engines/dm/projexpl.cpp @@ -165,7 +165,7 @@ bool ProjExpl::hasProjectileImpactOccurred(int16 impactType, int16 mapXCombo, in curCreatureIndex--; uint16 curCreatureType = curGroup->_type; CreatureInfo *curCreatureInfo = &_vm->_dungeonMan->_creatureInfos[curCreatureType]; - if ((projectileAssociatedThing == Thing::_explFireBall) && (curCreatureType == k11_CreatureTypeBlackFlame)) { + if ((projectileAssociatedThing == Thing::_explFireBall) && (curCreatureType == kDMCreatureTypeBlackFlame)) { uint16 *curCreatureHealth = &curGroup->_health[curCreatureIndex]; *curCreatureHealth = MIN(1000, *curCreatureHealth + getProjectileImpactAttack(projectileThingData, projectileAssociatedThing)); goto T0217044; @@ -509,7 +509,7 @@ void ProjExpl::processEvent25(TimelineEvent *event) { break; case 0xFF83: if ((groupThing != Thing::_endOfList) && getFlag(creatureInfo->_attributes, k0x0040_MaskCreatureInfo_nonMaterial)) { - if ((creatureType == k19_CreatureTypeMaterializerZytaz) && (_vm->_dungeonMan->_currMapIndex == _vm->_dungeonMan->_partyMapIndex)) { + if ((creatureType == kDMCreatureTypeMaterializerZytaz) && (_vm->_dungeonMan->_currMapIndex == _vm->_dungeonMan->_partyMapIndex)) { int16 nonMaterialAdditionalAttack = attack >> 3; attack -= nonMaterialAdditionalAttack; nonMaterialAdditionalAttack <<= 1; |