diff options
| author | Strangerke | 2016-09-18 12:52:01 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-18 12:52:01 +0200 |
| commit | 8668f6765b5b3472257b4d19fbdcb722d2c40ec7 (patch) | |
| tree | 7027f4f65fd86bdaf8616f9ec26faf8e7ad01393 /engines/dm/movesens.cpp | |
| parent | 0750c20fe7e2d152a7e2b181c455c3d24e653c86 (diff) | |
| download | scummvm-rg350-8668f6765b5b3472257b4d19fbdcb722d2c40ec7.tar.gz scummvm-rg350-8668f6765b5b3472257b4d19fbdcb722d2c40ec7.tar.bz2 scummvm-rg350-8668f6765b5b3472257b4d19fbdcb722d2c40ec7.zip | |
DM: Rename members of Behavior, some more renaming
Diffstat (limited to 'engines/dm/movesens.cpp')
| -rw-r--r-- | engines/dm/movesens.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp index b80f006e8c..d22db51cfa 100644 --- a/engines/dm/movesens.cpp +++ b/engines/dm/movesens.cpp @@ -620,7 +620,7 @@ int16 MovesensMan::getSound(CreatureType creatureType) { case kDMCreatureTypeRuster: case kDMCreatureTypeScreamer: case kDMCreatureTypeRockpile: - case kCreatureTypeMagentaWorm: + case kDMCreatureTypeMagentaWorm: case kDMCreatureTypeOitu: return k26_soundMOVE_SCREAMER_ROCK_ROCKPILE_MAGENTA_WORM_WORM_PAIN_RAT_HELLHOUND_RUSTER_GIANT_SCORPION_SCORPION_OITU; case kDMCreatureTypeRedDragon: @@ -653,7 +653,7 @@ int16 MovesensMan::getTeleporterRotatedGroupResult(Teleporter *teleporter, Thing updatedGroupDirections = _vm->normalizeModulo4(groupDirections + rotation); uint16 updatedGroupCells = _vm->_groupMan->getGroupCells(group, mapIndex); - if (updatedGroupCells != k255_CreatureTypeSingleCenteredCreature) { + if (updatedGroupCells != kDMCreatureTypeSingleCenteredCreature) { int16 groupCells = updatedGroupCells; int16 creatureSize = getFlag(_vm->_dungeonMan->_creatureInfos[group->_type]._attributes, kDMCreatureMaskSize); int16 relativeRotation = _vm->normalizeModulo4(4 + updatedGroupDirections - groupDirections); @@ -673,7 +673,7 @@ int16 MovesensMan::getTeleporterRotatedGroupResult(Teleporter *teleporter, Thing } _vm->_dungeonMan->setGroupDirections(group, updatedGroupDirections, mapIndex); _vm->_dungeonMan->setGroupCells(group, updatedGroupCells, mapIndex); - if ((mapIndex == _vm->_dungeonMan->_partyMapIndex) && (group->setBehaviour(k6_behavior_ATTACK))) + if ((mapIndex == _vm->_dungeonMan->_partyMapIndex) && (group->setBehaviour(kDMBehaviorAttack))) return group->getActiveGroupIndex() + 2; return 1; |