diff options
| author | Strangerke | 2016-09-19 00:17:36 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-19 00:17:36 +0200 |
| commit | 4a8c8a53bd5095723883ff52e3b3cf4fb231558c (patch) | |
| tree | 23b006e47d5dfa485608ce24f5637040ab15b5fa /engines/dm/timeline.cpp | |
| parent | 383cc850b99cc7b2ed30e9fde9bbf77a128f0e6d (diff) | |
| download | scummvm-rg350-4a8c8a53bd5095723883ff52e3b3cf4fb231558c.tar.gz scummvm-rg350-4a8c8a53bd5095723883ff52e3b3cf4fb231558c.tar.bz2 scummvm-rg350-4a8c8a53bd5095723883ff52e3b3cf4fb231558c.zip | |
DM: Rename members of SoundIndex
Diffstat (limited to 'engines/dm/timeline.cpp')
| -rw-r--r-- | engines/dm/timeline.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp index 10c3aa07c6..aed99ac923 100644 --- a/engines/dm/timeline.cpp +++ b/engines/dm/timeline.cpp @@ -402,7 +402,7 @@ void Timeline::processEventDoorAnimation(TimelineEvent *event) { // See BUG0_78 int16 wounds = kDMWoundTorso | (verticalDoorFl ? kDMWoundHead : kDMWoundReadHand | kDMWoundActionHand); if (_vm->_championMan->getDamagedChampionCount(5, wounds, kDMAttackTypeSelf)) - _vm->_sound->requestPlay(k18_soundPARTY_DAMAGED, mapX, mapY, kDMSoundModePlayIfPrioritized); + _vm->_sound->requestPlay(kDMSoundIndexPartyDamaged, mapX, mapY, kDMSoundModePlayIfPrioritized); } event->_mapTime++; addEventGetEventIndex(event); @@ -418,7 +418,7 @@ void Timeline::processEventDoorAnimation(TimelineEvent *event) { int16 nextState = doorState - 1; doorState = (doorState == kDMDoorStateOpen) ? kDMDoorStateOpen : (DoorState) nextState; curSquare->setDoorState(doorState); - _vm->_sound->requestPlay(k04_soundWOODEN_THUD_ATTACK_TROLIN_ANTMAN_STONE_GOLEM, mapX, mapY, kDMSoundModePlayIfPrioritized); + _vm->_sound->requestPlay(kDMSoundIndexWoodenThudAttackTrolinAntmanStoneGolem, mapX, mapY, kDMSoundModePlayIfPrioritized); event->_mapTime++; addEventGetEventIndex(event); return; @@ -435,7 +435,7 @@ void Timeline::processEventDoorAnimation(TimelineEvent *event) { int16 prevDoorEffect = doorState - 1; doorState = (DoorState) ((sensorEffect == kDMSensorEffectSet) ? prevDoorEffect : nextDoorEffect); curSquare->setDoorState(doorState); - _vm->_sound->requestPlay(k02_soundDOOR_RATTLE, mapX, mapY, kDMSoundModePlayIfPrioritized); + _vm->_sound->requestPlay(kDMSoundIndexDoorRattle, mapX, mapY, kDMSoundModePlayIfPrioritized); if (sensorEffect == kDMSensorEffectSet) { if (doorState == kDMDoorStateOpen) @@ -736,7 +736,7 @@ void Timeline::processEventSquareCorridor(TimelineEvent *event) { _vm->_groupMan->groupGetGenerated((CreatureType)curSensor->getData(), healthMultiplier, creatureCount, (Direction)_vm->getRandomNumber(4), mapX, mapY); if (curSensor->getAttrAudibleA()) - _vm->_sound->requestPlay(k17_soundBUZZ, mapX, mapY, kDMSoundModePlayIfPrioritized); + _vm->_sound->requestPlay(kDMSoundIndexBuzz, mapX, mapY, kDMSoundModePlayIfPrioritized); if (curSensor->getAttrOnlyOnce()) curSensor->setTypeDisabled(); @@ -771,7 +771,7 @@ void Timeline::processEventsMoveGroup(TimelineEvent *event) { T0252001: if (((_vm->_dungeonMan->_currMapIndex != _vm->_dungeonMan->_partyMapIndex) || (mapX != _vm->_dungeonMan->_partyMapX) || (mapY != _vm->_dungeonMan->_partyMapY)) && (_vm->_groupMan->groupGetThing(mapX, mapY) == Thing::_endOfList)) { /* BUG0_24 Lord Chaos may teleport into one of the Black Flames and become invisible until the Black Flame is killed. In this case, _vm->_groupMan->f175_groupGetThing returns the Black Flame thing and the Lord Chaos thing is not moved into the dungeon until the Black Flame is killed */ if (event->_type == k61_TMEventTypeMoveGroupAudible) - _vm->_sound->requestPlay(k17_soundBUZZ, mapX, mapY, kDMSoundModePlayIfPrioritized); + _vm->_sound->requestPlay(kDMSoundIndexBuzz, mapX, mapY, kDMSoundModePlayIfPrioritized); _vm->_moveSens->getMoveResult(Thing(event->_Cu._slot), kDMMapXNotOnASquare, 0, mapX, mapY); } else { |