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/menus.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/menus.cpp')
| -rw-r--r-- | engines/dm/menus.cpp | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp index 41579f4afe..894bf658a9 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -1551,15 +1551,15 @@ bool MenuMan::isGroupFrightenedByAction(int16 champIndex, uint16 actionIndex, in  	Group *targetGroup = (Group *)_vm->_dungeonMan->getThingData(_actionTargetGroupThing);  	CreatureInfo *creatureInfo = &_vm->_dungeonMan->_creatureInfos[targetGroup->_type];  	uint16 fearResistance = creatureInfo->getFearResistance(); -	if ((fearResistance > _vm->getRandomNumber(frightAmount)) || (fearResistance == k15_immuneToFear)) { +	if ((fearResistance > _vm->getRandomNumber(frightAmount)) || (fearResistance == kDMImmuneToFear)) {  		experience >>= 1;  	} else {  		ActiveGroup *activeGroup = &_vm->_groupMan->_activeGroups[targetGroup->getActiveGroupIndex()]; -		if (targetGroup->getBehaviour() == k6_behavior_ATTACK) { +		if (targetGroup->getBehaviour() == kDMBehaviorAttack) {  			_vm->_groupMan->stopAttacking(activeGroup, mapX, mapY);  			_vm->_groupMan->startWandering(mapX, mapY);  		} -		targetGroup->setBehaviour(k5_behavior_FLEE); +		targetGroup->setBehaviour(kDMBehaviorFlee);  		activeGroup->_delayFleeingFromTarget = ((16 - fearResistance) << 2) / creatureInfo->_movementTicks;  		retVal = true;  	} | 
