diff options
| author | Strangerke | 2016-09-09 07:32:32 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-09 07:32:32 +0200 |
| commit | 93fb0efc0bd297be9399cd03b3523cb9f8117691 (patch) | |
| tree | a5dbd542b44c19d7ca7e9db9394f8944d8918d0e /engines/dm/timeline.cpp | |
| parent | 1b482a1e129b2bf00f49a9c4ef5c8d84470be1af (diff) | |
| download | scummvm-rg350-93fb0efc0bd297be9399cd03b3523cb9f8117691.tar.gz scummvm-rg350-93fb0efc0bd297be9399cd03b3523cb9f8117691.tar.bz2 scummvm-rg350-93fb0efc0bd297be9399cd03b3523cb9f8117691.zip | |
DM: More renaming in champion.h
Diffstat (limited to 'engines/dm/timeline.cpp')
| -rw-r--r-- | engines/dm/timeline.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp index 234881eb9f..f92a09fe10 100644 --- a/engines/dm/timeline.cpp +++ b/engines/dm/timeline.cpp @@ -333,7 +333,7 @@ void Timeline::processTimeline() { break; case k72_TMEventTypeChampionShield: _vm->_championMan->_champions[newEvent._priority]._shieldDefense -= newEvent._B._defense; - setFlag(_vm->_championMan->_champions[newEvent._priority]._attributes, kDMChampionAttributeStatusBox); + setFlag(_vm->_championMan->_champions[newEvent._priority]._attributes, kDMAttributeStatusBox); _vm->_championMan->drawChampionState((ChampionIndex)newEvent._priority); break; case k73_TMEventTypeThievesEye: @@ -400,7 +400,7 @@ void Timeline::processEventDoorAnimation(TimelineEvent *event) { // Strangerke // Original bug fixed - A closing horizontal door wounds champions to the head instead of to the hands. Missing parenthesis in the condition cause all doors to wound the head in addition to the torso // See BUG0_78 - int16 wounds = kDMChampionWoundTorso | (verticalDoorFl ? kDMChampionWoundHead : kDMChampionWoundReadHand | kDMChampionWoundActionHand); + int16 wounds = kDMWoundTorso | (verticalDoorFl ? kDMWoundHead : kDMWoundReadHand | kDMWoundActionHand); if (_vm->_championMan->getDamagedChampionCount(5, wounds, k2_attackType_SELF)) _vm->_sound->requestPlay(k18_soundPARTY_DAMAGED, mapX, mapY, k1_soundModePlayIfPrioritized); } @@ -815,7 +815,7 @@ void Timeline::procesEventEnableGroupGenerator(TimelineEvent *event) { void Timeline::processEventEnableChampionAction(uint16 champIndex) { Champion *curChampion = &_vm->_championMan->_champions[champIndex]; curChampion->_enableActionEventIndex = -1; - clearFlag(curChampion->_attributes, kDMChampionAttributeDisableAction); + clearFlag(curChampion->_attributes, kDMAttributeDisableAction); if (curChampion->_actionIndex != k255_ChampionActionNone) { curChampion->_actionDefense -= _actionDefense[curChampion->_actionDefense]; } @@ -832,7 +832,7 @@ void Timeline::processEventEnableChampionAction(uint16 champIndex) { } } } - setFlag(curChampion->_attributes, kDMChampionAttributeActionHand); + setFlag(curChampion->_attributes, kDMAttributeActionHand); _vm->_championMan->drawChampionState((ChampionIndex)champIndex); } curChampion->_actionIndex = k255_ChampionActionNone; @@ -872,7 +872,7 @@ void Timeline::processEventHideDamageReceived(uint16 champIndex) { _vm->_inventoryMan->drawStatusBoxPortrait((ChampionIndex)champIndex); _vm->_eventMan->hideMouse(); } else { - setFlag(curChampion->_attributes, kDMChampionAttributeNameTitle); + setFlag(curChampion->_attributes, kDMAttributeNameTitle); _vm->_championMan->drawChampionState((ChampionIndex)champIndex); } } @@ -905,7 +905,7 @@ void Timeline::processEventLight(TimelineEvent *event) { void Timeline::refreshAllChampionStatusBoxes() { for (uint16 idx = kDMChampionFirst; idx < _vm->_championMan->_partyChampionCount; idx++) - setFlag(_vm->_championMan->_champions[idx]._attributes, kDMChampionAttributeStatusBox); + setFlag(_vm->_championMan->_champions[idx]._attributes, kDMAttributeStatusBox); _vm->_championMan->drawAllChampionStates(); } |