aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress/entities/chapters.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/lastexpress/entities/chapters.cpp')
-rw-r--r--engines/lastexpress/entities/chapters.cpp72
1 files changed, 36 insertions, 36 deletions
diff --git a/engines/lastexpress/entities/chapters.cpp b/engines/lastexpress/entities/chapters.cpp
index 95d1092fd8..8346d7836d 100644
--- a/engines/lastexpress/entities/chapters.cpp
+++ b/engines/lastexpress/entities/chapters.cpp
@@ -173,9 +173,9 @@ IMPLEMENT_FUNCTION(6, Chapters, firstDream)
case kActionOpenDoor:
if (params->param1) {
getEntities()->clearSequences(kEntityChapters);
- getSoundQueue()->processEntry(kEntityChapters);
+ getSoundQueue()->fade(kEntityChapters);
getSound()->playSound(kEntityPlayer, "LIB014");
- getSoundQueue()->resetState();
+ getSoundQueue()->startAmbient();
ENTITY_PARAM(0, 4) = 7;
@@ -243,30 +243,30 @@ IMPLEMENT_FUNCTION(6, Chapters, firstDream)
RESET_ENTITY_STATE(kEntityHadija, Alouan, setup_function12);
if (ENTITY_PARAM(0, 2) || ENTITY_PARAM(0, 3)) {
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
ENTITY_PARAM(0, 2) = 0;
ENTITY_PARAM(0, 3) = 0;
}
- getSoundQueue()->processEntries();
+ getSoundQueue()->endAmbient();
if (getSoundQueue()->isBuffered("CON1505"))
- getSoundQueue()->processEntry("CON1505");
+ getSoundQueue()->fade("CON1505");
if (getSoundQueue()->isBuffered("AUG1057"))
- getSoundQueue()->processEntry("AUG1057");
+ getSoundQueue()->fade("AUG1057");
if (getSoundQueue()->isBuffered("ZFX1005"))
- getSoundQueue()->processEntry("ZFX1005");
+ getSoundQueue()->fade("ZFX1005");
else if (getSoundQueue()->isBuffered("ZFX1006"))
- getSoundQueue()->processEntry("ZFX1006");
+ getSoundQueue()->fade("ZFX1006");
else if (getSoundQueue()->isBuffered("ZFX1007"))
- getSoundQueue()->processEntry("ZFX1007");
+ getSoundQueue()->fade("ZFX1007");
else if (getSoundQueue()->isBuffered("ZFX1007A"))
- getSoundQueue()->processEntry("ZFX1007A");
+ getSoundQueue()->fade("ZFX1007A");
else if (getSoundQueue()->isBuffered("ZFX1007B"))
- getSoundQueue()->processEntry("ZFX1007B");
+ getSoundQueue()->fade("ZFX1007B");
getSound()->playSound(kEntityPlayer, "MUS008", kVolumeFull);
getInventory()->unselectItem();
@@ -317,7 +317,7 @@ IMPLEMENT_FUNCTION(7, Chapters, chapter1Init)
return;
getProgress().chapter = kChapter1;
- getSoundQueue()->resetState();
+ getSoundQueue()->startAmbient();
getState()->time = kTimeStartGame;
getState()->timeDelta = 0;
@@ -584,7 +584,7 @@ label_chapter1_next:
}
if (ENTITY_PARAM(0, 3)) {
- getSoundQueue()->resetState();
+ getSoundQueue()->startAmbient();
ENTITY_PARAM(0, 3) = 0;
if (params->param4) {
@@ -715,7 +715,7 @@ IMPLEMENT_FUNCTION(9, Chapters, chapter1Next)
if (savepoint.action == kActionDefault) {
// Reset sound cache
if (ENTITY_PARAM(0, 2) || ENTITY_PARAM(0, 3)) {
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
ENTITY_PARAM(0, 2) = 0;
ENTITY_PARAM(0, 3) = 0;
}
@@ -814,7 +814,7 @@ IMPLEMENT_FUNCTION(11, Chapters, chapter2Init)
// Reset sound cache
if (ENTITY_PARAM(0, 2) || ENTITY_PARAM(0, 3)) {
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
ENTITY_PARAM(0, 2) = 0;
ENTITY_PARAM(0, 3) = 0;
}
@@ -899,7 +899,7 @@ IMPLEMENT_FUNCTION(14, Chapters, chapter3Init)
getObjects()->update(kObject107, kEntityPlayer, kObjectLocation3, kCursorKeepValue, kCursorKeepValue);
if (ENTITY_PARAM(0, 2) || ENTITY_PARAM(0, 3)) {
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
ENTITY_PARAM(0, 2) = 0;
ENTITY_PARAM(0, 3) = 0;
}
@@ -1023,7 +1023,7 @@ label_callback_8:
}
}
- getSoundQueue()->resetState();
+ getSoundQueue()->startAmbient();
getSound()->playSteam((CityIndex)ENTITY_PARAM(0, 4));
ENTITY_PARAM(0, 2) = 0;
@@ -1034,7 +1034,7 @@ label_callback_8:
}
if (ENTITY_PARAM(0, 3)) {
- getSoundQueue()->resetState();
+ getSoundQueue()->startAmbient();
ENTITY_PARAM(0, 3) = 0;
}
break;
@@ -1091,7 +1091,7 @@ IMPLEMENT_FUNCTION(16, Chapters, viennaEvents)
case kActionDefault:
getEntityData(kEntityPlayer)->car = kCarLocomotive;
if (getSoundQueue()->isBuffered(kEntityAbbot))
- getSoundQueue()->processEntry(kEntityAbbot);
+ getSoundQueue()->fade(kEntityAbbot);
if (!getEvent(kEventAugustBringBriefcase)) {
setCallback(1);
@@ -1208,8 +1208,8 @@ IMPLEMENT_FUNCTION(18, Chapters, chapter4Init)
if (savepoint.action != kActionDefault)
return;
- getSoundQueue()->processEntries();
- getSoundQueue()->resetState();
+ getSoundQueue()->endAmbient();
+ getSoundQueue()->startAmbient();
getProgress().isTrainRunning = true;
@@ -1235,7 +1235,7 @@ IMPLEMENT_FUNCTION(18, Chapters, chapter4Init)
getObjects()->update(kObject107, kEntityPlayer, kObjectLocation3, kCursorKeepValue, kCursorKeepValue);
if (ENTITY_PARAM(0, 2) || ENTITY_PARAM(0, 3)) {
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
ENTITY_PARAM(0, 2) = 0;
ENTITY_PARAM(0, 3) = 0;
}
@@ -1384,7 +1384,7 @@ label_callback_4:
}
if (ENTITY_PARAM(0, 3)) {
- getSoundQueue()->resetState();
+ getSoundQueue()->startAmbient();
ENTITY_PARAM(0, 3) = 0;
} else if (!params->param2 && !params->param3) {
getSound()->playSound(kEntityChapters, "ZFX1001");
@@ -1422,16 +1422,16 @@ label_callback_4:
case 5:
if (getSoundQueue()->isBuffered(kEntityChapters))
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
getAction()->playAnimation(kEventTrainExplosionBridge);
getLogic()->gameOver(kSavegameTypeIndex, 1, kSceneNone, true);
break;
case 6:
- getSoundQueue()->processEntries();
+ getSoundQueue()->endAmbient();
getAction()->playAnimation(kEventTylerCastleDream);
- getSoundQueue()->resetState();
+ getSoundQueue()->startAmbient();
getProgress().field_18 = 1;
@@ -1530,7 +1530,7 @@ label_callback_4:
params->param1 = 1;
if (ENTITY_PARAM(0, 2) || ENTITY_PARAM(0, 3)) {
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
ENTITY_PARAM(0, 2) = 0;
ENTITY_PARAM(0, 3) = 0;
@@ -1593,7 +1593,7 @@ label_callback_4:
getState()->time = kTime2520000;
if (getSoundQueue()->isBuffered(kEntityChapters))
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
getEntities()->clearSequences(kEntityChapters);
getInventory()->removeItem(kItemTelegram);
@@ -1606,7 +1606,7 @@ label_callback_4:
case kAction201959744:
if (getSoundQueue()->isBuffered(kEntityChapters))
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
getSound()->playSound(kEntityTrain, "ZFX4001", kVolumeFull);
@@ -1714,7 +1714,7 @@ IMPLEMENT_FUNCTION(21, Chapters, chapter5Init)
getObjects()->updateModel(kObjectRestaurantCar, kObjectModel2);
if (ENTITY_PARAM(0, 2) || ENTITY_PARAM(0, 3)) {
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
ENTITY_PARAM(0, 2) = 0;
ENTITY_PARAM(0, 3) = 0;
}
@@ -1747,7 +1747,7 @@ IMPLEMENT_FUNCTION(22, Chapters, chapter5Handler)
if (!getProgress().isNightTime) {
getSound()->playSound(kEntityChapters, "ARRIVE", kVolume8);
- getSoundQueue()->processEntries();
+ getSoundQueue()->endAmbient();
}
}
@@ -1756,7 +1756,7 @@ IMPLEMENT_FUNCTION(22, Chapters, chapter5Handler)
if (!getEvent(kEventLocomotiveMilosDay) && !getEvent(kEventLocomotiveMilosNight)) {
getSound()->playSound(kEntityChapters, "ARRIVE", kVolume8);
- getSoundQueue()->processEntries();
+ getSoundQueue()->endAmbient();
}
}
break;
@@ -1786,7 +1786,7 @@ IMPLEMENT_FUNCTION(22, Chapters, chapter5Handler)
getState()->time = kTime2916000;
if (getSoundQueue()->isBuffered(kEntityChapters))
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
break;
}
IMPLEMENT_FUNCTION_END
@@ -1801,7 +1801,7 @@ void Chapters::enterExitStation(const SavePoint &savepoint, bool isEnteringStati
return;
}
- getSoundQueue()->removeFromQueue(kEntityChapters);
+ getSoundQueue()->stop(kEntityChapters);
if (!ENTITY_PARAM(0, 2)) {
if (ENTITY_PARAM(0, 3))
@@ -1869,7 +1869,7 @@ void Chapters::enterExitHelper(bool isEnteringStation) {
EXPOSE_PARAMS(EntityData::EntityParametersSIIS);
getSound()->playSound(kEntityChapters, isEnteringStation ? "ARRIVE" : "DEPART", kVolume8);
- getSoundQueue()->processEntries();
+ getSoundQueue()->endAmbient();
getObjects()->update(kObjectHandleOutsideLeft, kEntityPlayer, kObjectLocation1, kCursorNormal, isEnteringStation ? kCursorNormal : kCursorHand);
getObjects()->update(kObjectHandleOutsideRight, kEntityPlayer, kObjectLocation1, kCursorNormal, isEnteringStation ? kCursorNormal : kCursorHand);
@@ -1888,7 +1888,7 @@ void Chapters::enterExitHelper(bool isEnteringStation) {
}
void Chapters::playSteam() const {
- getSoundQueue()->resetState();
+ getSoundQueue()->startAmbient();
getSound()->playSteam((CityIndex)ENTITY_PARAM(0, 4));
ENTITY_PARAM(0, 2) = 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-04 16:04:56 +0000