aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/timeline.cpp
diff options
context:
space:
mode:
authorStrangerke2016-09-12 22:36:17 +0200
committerStrangerke2016-09-12 22:37:54 +0200
commitedf6e4f2d97794adf2af246c5577d46b1055472d (patch)
treefd302da6c21dc8a52cc98717944642287e122d39 /engines/dm/timeline.cpp
parent4e28542029792a495a4420e5feda6030c67365da (diff)
downloadscummvm-rg350-edf6e4f2d97794adf2af246c5577d46b1055472d.tar.gz
scummvm-rg350-edf6e4f2d97794adf2af246c5577d46b1055472d.tar.bz2
scummvm-rg350-edf6e4f2d97794adf2af246c5577d46b1055472d.zip
DM: Enforce the use of SoundMode
Diffstat (limited to 'engines/dm/timeline.cpp')
-rw-r--r--engines/dm/timeline.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp
index 6d854d1ab4..0e61a87000 100644
--- a/engines/dm/timeline.cpp
+++ b/engines/dm/timeline.cpp
@@ -304,7 +304,7 @@ void Timeline::processTimeline() {
procesEventEnableGroupGenerator(curEvent);
break;
case k20_TMEventTypePlaySound:
- _vm->_sound->requestPlay(newEvent._Cu._soundIndex, newEvent._Bu._location._mapX, newEvent._Bu._location._mapY, k1_soundModePlayIfPrioritized);
+ _vm->_sound->requestPlay(newEvent._Cu._soundIndex, newEvent._Bu._location._mapX, newEvent._Bu._location._mapY, kDMSoundModePlayIfPrioritized);
break;
case k24_TMEventTypeRemoveFluxcage:
if (!_vm->_gameWon) {
@@ -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, k1_soundModePlayIfPrioritized);
+ _vm->_sound->requestPlay(k18_soundPARTY_DAMAGED, mapX, mapY, kDMSoundModePlayIfPrioritized);
}
event->_mapTime++;
addEventGetEventIndex(event);
@@ -417,7 +417,7 @@ void Timeline::processEventDoorAnimation(TimelineEvent *event) {
doorState = (doorState == k0_doorState_OPEN) ? k0_doorState_OPEN : (doorState - 1);
curSquare->setDoorState(doorState);
- _vm->_sound->requestPlay(k04_soundWOODEN_THUD_ATTACK_TROLIN_ANTMAN_STONE_GOLEM, mapX, mapY, k1_soundModePlayIfPrioritized);
+ _vm->_sound->requestPlay(k04_soundWOODEN_THUD_ATTACK_TROLIN_ANTMAN_STONE_GOLEM, mapX, mapY, kDMSoundModePlayIfPrioritized);
event->_mapTime++;
addEventGetEventIndex(event);
return;
@@ -432,7 +432,7 @@ void Timeline::processEventDoorAnimation(TimelineEvent *event) {
doorState += (sensorEffect == kDMSensorEffectSet) ? -1 : 1;
curSquare->setDoorState(doorState);
- _vm->_sound->requestPlay(k02_soundDOOR_RATTLE, mapX, mapY, k1_soundModePlayIfPrioritized);
+ _vm->_sound->requestPlay(k02_soundDOOR_RATTLE, mapX, mapY, kDMSoundModePlayIfPrioritized);
if (sensorEffect == kDMSensorEffectSet) {
if (doorState == k0_doorState_OPEN)
@@ -733,7 +733,7 @@ void Timeline::processEventSquareCorridor(TimelineEvent *event) {
_vm->_groupMan->groupGetGenerated(curSensor->getData(), healthMultiplier, creatureCount, (Direction)_vm->getRandomNumber(4), mapX, mapY);
if (curSensor->getAttrAudibleA())
- _vm->_sound->requestPlay(k17_soundBUZZ, mapX, mapY, k1_soundModePlayIfPrioritized);
+ _vm->_sound->requestPlay(k17_soundBUZZ, mapX, mapY, kDMSoundModePlayIfPrioritized);
if (curSensor->getAttrOnlyOnce())
curSensor->setTypeDisabled();
@@ -768,7 +768,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, k1_soundModePlayIfPrioritized);
+ _vm->_sound->requestPlay(k17_soundBUZZ, mapX, mapY, kDMSoundModePlayIfPrioritized);
_vm->_moveSens->getMoveResult(Thing(event->_Cu._slot), kDMMapXNotOnASquare, 0, mapX, mapY);
} else {