aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/bladerunner/game_constants.h27
-rw-r--r--engines/bladerunner/script/ai/gordo.cpp2
-rw-r--r--engines/bladerunner/script/scene/ar01.cpp2
-rw-r--r--engines/bladerunner/script/scene/ar02.cpp2
-rw-r--r--engines/bladerunner/script/scene/bb11.cpp2
-rw-r--r--engines/bladerunner/script/scene/ct01.cpp2
-rw-r--r--engines/bladerunner/script/scene/ct02.cpp2
-rw-r--r--engines/bladerunner/script/scene/dr05.cpp2
-rw-r--r--engines/bladerunner/script/scene/hc01.cpp2
-rw-r--r--engines/bladerunner/script/scene/hc02.cpp2
-rw-r--r--engines/bladerunner/script/scene/hc04.cpp2
-rw-r--r--engines/bladerunner/script/scene/hf04.cpp2
-rw-r--r--engines/bladerunner/script/scene/hf05.cpp4
-rw-r--r--engines/bladerunner/script/scene/hf06.cpp2
-rw-r--r--engines/bladerunner/script/scene/kp03.cpp2
-rw-r--r--engines/bladerunner/script/scene/kp07.cpp4
-rw-r--r--engines/bladerunner/script/scene/ma02.cpp2
-rw-r--r--engines/bladerunner/script/scene/ma04.cpp4
-rw-r--r--engines/bladerunner/script/scene/ma05.cpp2
-rw-r--r--engines/bladerunner/script/scene/nr02.cpp6
-rw-r--r--engines/bladerunner/script/scene/nr03.cpp6
-rw-r--r--engines/bladerunner/script/scene/nr04.cpp6
-rw-r--r--engines/bladerunner/script/scene/nr05.cpp6
-rw-r--r--engines/bladerunner/script/scene/nr06.cpp6
-rw-r--r--engines/bladerunner/script/scene/nr08.cpp11
-rw-r--r--engines/bladerunner/script/scene/nr09.cpp6
-rw-r--r--engines/bladerunner/script/scene/nr11.cpp2
-rw-r--r--engines/bladerunner/script/scene/tb02.cpp2
-rw-r--r--engines/bladerunner/script/scene/ug01.cpp2
-rw-r--r--engines/bladerunner/ui/end_credits.cpp3
30 files changed, 77 insertions, 48 deletions
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index bfcd922806..eefb019398 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -2310,6 +2310,33 @@ enum GoalMaggie {
kGoalMaggieDead = 599
};
+// Certain tracks are available at Frank Klepacki's website/portfolio for Blade Runner
+// Those are noted with their "official" name in a side-comment here, as they appear at the website
+// A few may not match the incremental number given in-game (eg kMusicGothic3 is "Gothic Club 2")
+enum MusicTracks {
+ kMusicArabLoop = 0, // Animoid Row track (Not available at Frank Klepacki's website/portfolio for Blade Runner)
+ kMusicBatl226M = 1, // "Battle Theme"
+ kMusicBRBlues = 2, // "Blade Runner Blues"
+ kMusicKyoto = 3, // "Etsuko Theme"
+ kMusicOneTime = 4, // "One More Time, Love" (Not available at Frank Klepacki's website/portfolio for Blade Runner)
+ kMusicGothic3 = 5, // "Gothic Club 2"
+ kMusicArkdFly1 = 6,
+ kMusicArkDnce1 = 7,
+ kMusicTaffy2 = 8, // "Taffy's Club 2"
+ kMusicTaffy3 = 9,
+ kMusicTaffy4 = 10,
+ kMusicBeating1 = 11,
+ kMusicCrysDie1 = 12,
+ kMusicGothic1 = 13, // "Gothic Club"
+ kMusicGothic2 = 14,
+ kMusicStrip1 = 15,
+ kMusicDkoDnce1 = 16,
+ kMusicCredits = 17, // "Blade Runner End Credits"
+ kMusicMoraji = 18,
+ kMusicClovDie1 = 19,
+ kMusicClovDies = 20,
+ kMusicLoveSong = 21 // "Love Theme" (Lucy, Dektora, Subway drive ending)
+};
} // End of namespace BladeRunner
#endif
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp
index a2573d11ac..0a2df013bf 100644
--- a/engines/bladerunner/script/ai/gordo.cpp
+++ b/engines/bladerunner/script/ai/gordo.cpp
@@ -595,7 +595,7 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
AI_Movement_Track_Flush(kActorGordo);
AI_Movement_Track_Append_Run(kActorGordo, 366, 0);
AI_Movement_Track_Repeat(kActorGordo);
- Music_Play(1, 50, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
break;
case kGoalGordoNR02RunAway2:
diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp
index 6c6067d1d5..a5acc146c2 100644
--- a/engines/bladerunner/script/scene/ar01.cpp
+++ b/engines/bladerunner/script/scene/ar01.cpp
@@ -41,7 +41,7 @@ enum kAR01Exits {
};
void SceneScriptAR01::InitializeScene() {
- Music_Play(0, 25, 0, 2, -1, 1, 2);
+ Music_Play(kMusicArabLoop, 25, 0, 2, -1, 1, 2);
if (Game_Flag_Query(kFlagHC01toAR01)) {
Setup_Scene_Information(-477.0f, 0.0f, -149.0f, 333);
} else if (Game_Flag_Query(kFlagAR02toAR01)) {
diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp
index 7816a0f569..b23507909b 100644
--- a/engines/bladerunner/script/scene/ar02.cpp
+++ b/engines/bladerunner/script/scene/ar02.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
void SceneScriptAR02::InitializeScene() {
- Music_Play(0, 22, 0, 2, -1, 1, 2);
+ Music_Play(kMusicBatl226M, 22, 0, 2, -1, 1, 2);
if (Game_Flag_Query(kFlagRC03toAR02)) {
Setup_Scene_Information(-560.0f, 0.0f, -799.0f, 333);
} else {
diff --git a/engines/bladerunner/script/scene/bb11.cpp b/engines/bladerunner/script/scene/bb11.cpp
index 3e34b0b53c..1c841829ea 100644
--- a/engines/bladerunner/script/scene/bb11.cpp
+++ b/engines/bladerunner/script/scene/bb11.cpp
@@ -122,7 +122,7 @@ void SceneScriptBB11::PlayerWalkedIn() {
) {
Actor_Set_Invisible(kActorMcCoy, true);
Actor_Set_Goal_Number(kActorSadik, kGoalSadikBB11ThrowMcCoy);
- Music_Play(11, 61, 0, 1, -1, 0, 0);
+ Music_Play(kMusicBeating1, 61, 0, 1, -1, 0, 0);
Player_Loses_Control();
}
}
diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp
index 5bf254b0f9..cf31d735ee 100644
--- a/engines/bladerunner/script/scene/ct01.cpp
+++ b/engines/bladerunner/script/scene/ct01.cpp
@@ -42,7 +42,7 @@ enum kCT01Exits {
};
void SceneScriptCT01::InitializeScene() {
- Music_Play(3, 28, 0, 2, -1, 1, 0);
+ Music_Play(kMusicKyoto, 28, 0, 2, -1, 1, 0);
Game_Flag_Reset(kFlagArrivedFromSpinner1);
if (Game_Flag_Query(kFlagCT02toCT01)) {
Game_Flag_Reset(kFlagCT02toCT01);
diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp
index fbb6a06835..b5aa8f6b17 100644
--- a/engines/bladerunner/script/scene/ct02.cpp
+++ b/engines/bladerunner/script/scene/ct02.cpp
@@ -293,7 +293,7 @@ void SceneScriptCT02::SceneFrameAdvanced(int frame) {
Sound_Play(203, 60, -20, 40, 50);
}
if (frame == 61) {
- Music_Play(1, 50, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
}
if (frame == 81) {
Scene_Exit_Add_2D_Exit(kCT02ExitCT03, 332, 163, 404, 297, 0);
diff --git a/engines/bladerunner/script/scene/dr05.cpp b/engines/bladerunner/script/scene/dr05.cpp
index 9f00bc2c66..254c8ef5e8 100644
--- a/engines/bladerunner/script/scene/dr05.cpp
+++ b/engines/bladerunner/script/scene/dr05.cpp
@@ -117,7 +117,7 @@ bool SceneScriptDR05::ClickedOnItem(int itemId, bool a2) {
Item_Remove_From_World(kItemChain);
Game_Flag_Set(kFlagDR05ChainShot);
Actor_Set_Goal_Number(kActorMoraji, kGoalMorajiFreed);
- Music_Play(18, 71, 0, 0, -1, 0, 2);
+ Music_Play(kMusicMoraji, 71, 0, 0, -1, 0, 2);
return true;
}
return false;
diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp
index ec8946b2e9..10d64a17db 100644
--- a/engines/bladerunner/script/scene/hc01.cpp
+++ b/engines/bladerunner/script/scene/hc01.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
void SceneScriptHC01::InitializeScene() {
- Music_Play(0, 31, 0, 2, -1, 1, 2);
+ Music_Play(kMusicArabLoop, 31, 0, 2, -1, 1, 2);
if (Game_Flag_Query(kFlagHC02toHC01)) {
Setup_Scene_Information( 64.0f, 0.14f, 83.0f, 266);
} else if (Game_Flag_Query(kFlagHC03toHC01)) {
diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp
index 7a8967b27d..9a3f7e7ffd 100644
--- a/engines/bladerunner/script/scene/hc02.cpp
+++ b/engines/bladerunner/script/scene/hc02.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
void SceneScriptHC02::InitializeScene() {
- Music_Play(4, 45, -60, 1, -1, 1, 3);
+ Music_Play(kMusicOneTime, 45, -60, 1, -1, 1, 3);
if (Game_Flag_Query(kFlagHC04toHC02)) {
Setup_Scene_Information(-88.0f, 0.14f, -463.0f, 540);
} else {
diff --git a/engines/bladerunner/script/scene/hc04.cpp b/engines/bladerunner/script/scene/hc04.cpp
index a138d96ebd..f457bbd378 100644
--- a/engines/bladerunner/script/scene/hc04.cpp
+++ b/engines/bladerunner/script/scene/hc04.cpp
@@ -31,7 +31,7 @@ void SceneScriptHC04::InitializeScene() {
} else {
Setup_Scene_Information(-88.0f, 0.14f, -463.0f, 1013);
}
- Music_Play(4, 14, -90, 1, -1, 1, 2);
+ Music_Play(kMusicOneTime, 14, -90, 1, -1, 1, 2);
Actor_Put_In_Set(kActorIsabella, kSetHC01_HC02_HC03_HC04);
Actor_Set_At_XYZ(kActorIsabella, -210.0f, 0.0f, -445.0f, 250);
diff --git a/engines/bladerunner/script/scene/hf04.cpp b/engines/bladerunner/script/scene/hf04.cpp
index 4fb4432b0d..a6524313e1 100644
--- a/engines/bladerunner/script/scene/hf04.cpp
+++ b/engines/bladerunner/script/scene/hf04.cpp
@@ -171,7 +171,7 @@ void SceneScriptHF04::PlayerWalkedIn() {
|| Actor_Query_Goal_Number(kActorLucy) == kGoalLucyHF04Run1
) {
Player_Set_Combat_Mode(true);
- Music_Play(1, 60, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 60, 0, 2, -1, 0, 0);
}
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -45.0f, -0.31f, 307.0f, 0, false, true, 0);
Delay(2500);
diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp
index e5932a85ce..4cdc3f02b7 100644
--- a/engines/bladerunner/script/scene/hf05.cpp
+++ b/engines/bladerunner/script/scene/hf05.cpp
@@ -238,7 +238,7 @@ void SceneScriptHF05::SceneFrameAdvanced(int frame) {
case 179:
Sound_Play(490, 90, 0, 0, 50);
- Music_Play(1, 50, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
break;
case 186:
@@ -307,7 +307,7 @@ void SceneScriptHF05::PlayerWalkedIn() {
&& !Game_Flag_Query(kFlagHF05PoliceArrived)
) {
Game_Flag_Set(kFlagHF05PoliceArrived);
- Music_Play(1, 40, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 40, 0, 2, -1, 0, 0);
Actor_Says(kActorOfficerGrayford, 200, kAnimationModeTalk);
Actor_Says(kActorOfficerGrayford, 210, kAnimationModeTalk);
Actor_Set_Goal_Number(kActorOfficerLeary, 420);
diff --git a/engines/bladerunner/script/scene/hf06.cpp b/engines/bladerunner/script/scene/hf06.cpp
index 8e806aa5f0..a5f8b0d022 100644
--- a/engines/bladerunner/script/scene/hf06.cpp
+++ b/engines/bladerunner/script/scene/hf06.cpp
@@ -181,7 +181,7 @@ void SceneScriptHF06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
}
if (otherActorId != -1) {
- Music_Play(21, 35, 0, 3, -1, 0, 0);
+ Music_Play(kMusicLoveSong, 35, 0, 3, -1, 0, 0);
Player_Set_Combat_Mode(false);
Delay(1000);
Actor_Voice_Over(990, kActorVoiceOver);
diff --git a/engines/bladerunner/script/scene/kp03.cpp b/engines/bladerunner/script/scene/kp03.cpp
index 9f223237bb..a8355fbb04 100644
--- a/engines/bladerunner/script/scene/kp03.cpp
+++ b/engines/bladerunner/script/scene/kp03.cpp
@@ -236,7 +236,7 @@ void SceneScriptKP03::SceneFrameAdvanced(int frame) {
if (bombTriggeredByActor == kActorSteele) {
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleKP03Exploded);
- Music_Play(12, 25, 0, 1, -1, 0, 0);
+ Music_Play(kMusicCrysDie1, 25, 0, 1, -1, 0, 0);
if (Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorSteele) <= 120) {
bombTriggeredByActor = kActorMcCoy;
}
diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp
index 020d496b6f..89cf64929c 100644
--- a/engines/bladerunner/script/scene/kp07.cpp
+++ b/engines/bladerunner/script/scene/kp07.cpp
@@ -94,7 +94,7 @@ void SceneScriptKP07::InitializeScene() {
void SceneScriptKP07::SceneLoaded() {
if (!Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
- Music_Play(19, 25, 0, 0, -1, 1, 0);
+ Music_Play(kMusicClovDie1, 25, 0, 0, -1, 1, 0);
}
Obstacle_Object("BUNK_TRAY01", true);
Unobstacle_Object("BUNK_TRAY01", true);
@@ -121,7 +121,7 @@ bool SceneScriptKP07::ClickedOnActor(int actorId) {
if (Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
Actor_Set_Goal_Number(kActorClovis, kGoalClovisKP07FlyAway);
} else {
- Music_Play(20, 31, 0, 0, -1, 1, 0);
+ Music_Play(kMusicClovDies, 31, 0, 0, -1, 1, 0);
Actor_Set_Goal_Number(kActorClovis, kGoalClovisKP07TalkToMcCoy);
}
return true;
diff --git a/engines/bladerunner/script/scene/ma02.cpp b/engines/bladerunner/script/scene/ma02.cpp
index 5b3d9b0fe4..49d2f551e9 100644
--- a/engines/bladerunner/script/scene/ma02.cpp
+++ b/engines/bladerunner/script/scene/ma02.cpp
@@ -194,7 +194,7 @@ void SceneScriptMA02::PlayerWalkedIn() {
) {
if (Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
Actor_Says(kActorMcCoy, 2390, kAnimationModeIdle);
- Music_Play(2, 25, 0, 3, -1, 0, 0);
+ Music_Play(kMusicBRBlues, 25, 0, 3, -1, 0, 0);
} else {
Actor_Says(kActorMcCoy, 2385, kAnimationModeTalk);
}
diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp
index d9640d3f61..0302296bcd 100644
--- a/engines/bladerunner/script/scene/ma04.cpp
+++ b/engines/bladerunner/script/scene/ma04.cpp
@@ -186,7 +186,7 @@ bool SceneScriptMA04::ClickedOn2DRegion(int region) {
} else {
phoneCallWithSteele();
}
- Music_Play(2, 52, 0, 3, -1, 0, 0);
+ Music_Play(kMusicBRBlues, 52, 0, 3, -1, 0, 0);
return false;
}
if (Actor_Clue_Query(kActorClovis, kClueMcCoyRetiredZuben) && !Game_Flag_Query(kFlagMA04PhoneMessageFromClovis)) {
@@ -299,7 +299,7 @@ void SceneScriptMA04::PlayerWalkedIn() {
return;
}
if ((Game_Flag_Query(kFlagZubenRetired) || Game_Flag_Query(kFlagZubenSpared)) && !Game_Flag_Query(kFlagChapter1Ending)) {
- Music_Play(2, 52, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBRBlues, 52, 0, 2, -1, 0, 0);
Player_Loses_Control();
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 955.0f, 1677.0f, 0, true, false, 0);
if (isPhoneMessageWaiting() || isPhoneRinging()) {
diff --git a/engines/bladerunner/script/scene/ma05.cpp b/engines/bladerunner/script/scene/ma05.cpp
index a10086168c..164ca91a73 100644
--- a/engines/bladerunner/script/scene/ma05.cpp
+++ b/engines/bladerunner/script/scene/ma05.cpp
@@ -114,7 +114,7 @@ void SceneScriptMA05::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
}
void SceneScriptMA05::PlayerWalkedIn() {
- Music_Play(2, 52, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBRBlues, 52, 0, 2, -1, 0, 0);
if ((Random_Query(0, 4) == 1 || (Game_Flag_Query(kFlagChapter1Ending) && !Game_Flag_Query(kFlagChapter1Ended))) && Global_Variable_Query(kVariableChapter) == 1) {
Scene_Loop_Set_Default(kMA05LoopMain);
Scene_Loop_Start_Special(kSceneLoopModeOnce, kMA05LoopSpinner, true);
diff --git a/engines/bladerunner/script/scene/nr02.cpp b/engines/bladerunner/script/scene/nr02.cpp
index f485fdf830..cdd9671bf5 100644
--- a/engines/bladerunner/script/scene/nr02.cpp
+++ b/engines/bladerunner/script/scene/nr02.cpp
@@ -245,11 +245,11 @@ void SceneScriptNR02::DialogueQueueFlushed(int a1) {
void SceneScriptNR02::playNextMusic() {
int track = Global_Variable_Query(kVariableTaffyLewisMusic);
if (track == 0) {
- Music_Play(8, 41, 0, 2, -1, 0, 0);
+ Music_Play(kMusicTaffy2, 41, 0, 2, -1, 0, 0);
} else if (track == 1) {
- Music_Play(9, 41, 0, 2, -1, 0, 0);
+ Music_Play(kMusicTaffy3, 41, 0, 2, -1, 0, 0);
} else if (track == 2) {
- Music_Play(10, 41, 0, 2, -1, 0, 0);
+ Music_Play(kMusicTaffy4, 41, 0, 2, -1, 0, 0);
}
track++;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr03.cpp b/engines/bladerunner/script/scene/nr03.cpp
index 4f97be5d26..2962ddbe22 100644
--- a/engines/bladerunner/script/scene/nr03.cpp
+++ b/engines/bladerunner/script/scene/nr03.cpp
@@ -358,11 +358,11 @@ void SceneScriptNR03::playNextMusic() {
} else {
int track = Global_Variable_Query(kVariableEarlyQFrontMusic);
if (track == 0) {
- Music_Play(14, 51, 0, 2, -1, 0, 0);
+ Music_Play(kMusicGothic2, 51, 0, 2, -1, 0, 0);
} else if (track == 1) {
- Music_Play(13, 51, 0, 2, -1, 0, 0);
+ Music_Play(kMusicGothic1, 51, 0, 2, -1, 0, 0);
} else if (track == 2) {
- Music_Play(5, 51, 0, 2, -1, 0, 0);
+ Music_Play(kMusicGothic3, 51, 0, 2, -1, 0, 0);
}
track++;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp
index 03809d9d47..22ff810f26 100644
--- a/engines/bladerunner/script/scene/nr04.cpp
+++ b/engines/bladerunner/script/scene/nr04.cpp
@@ -382,11 +382,11 @@ void SceneScriptNR04::druggedEffect(int frame) {
void SceneScriptNR04::playNextMusic() {
int track = Global_Variable_Query(kVariableEarlyQFrontMusic);
if (track == 0) {
- Music_Play(14, 11, 80, 2, -1, 0, 0);
+ Music_Play(kMusicGothic2, 11, 80, 2, -1, 0, 0);
} else if (track == 1) {
- Music_Play(13, 11, 80, 2, -1, 0, 0);
+ Music_Play(kMusicGothic1, 11, 80, 2, -1, 0, 0);
} else if (track == 2) {
- Music_Play(5, 11, 80, 2, -1, 0, 0);
+ Music_Play(kMusicGothic3, 11, 80, 2, -1, 0, 0);
}
track++;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr05.cpp b/engines/bladerunner/script/scene/nr05.cpp
index eb16152f31..342849ecf9 100644
--- a/engines/bladerunner/script/scene/nr05.cpp
+++ b/engines/bladerunner/script/scene/nr05.cpp
@@ -390,11 +390,11 @@ void SceneScriptNR05::playNextMusic() {
} else {
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
if (track == 0) {
- Music_Play(16, 61, -80, 2, -1, 0, 0);
+ Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
} else if (track == 1) {
- Music_Play(15, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
} else if (track == 2) {
- Music_Play(7, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
}
track++;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr06.cpp b/engines/bladerunner/script/scene/nr06.cpp
index 815a685eed..4f1cb7688b 100644
--- a/engines/bladerunner/script/scene/nr06.cpp
+++ b/engines/bladerunner/script/scene/nr06.cpp
@@ -148,11 +148,11 @@ void SceneScriptNR06::playNextMusic() {
} else {
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
if (track == 0) {
- Music_Play(16, 61, -80, 2, -1, 0, 0);
+ Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
} else if (track == 1) {
- Music_Play(15, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
} else if (track == 2) {
- Music_Play(7, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
}
track++;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr08.cpp b/engines/bladerunner/script/scene/nr08.cpp
index b2f62f7461..fe9c71031f 100644
--- a/engines/bladerunner/script/scene/nr08.cpp
+++ b/engines/bladerunner/script/scene/nr08.cpp
@@ -160,7 +160,7 @@ void SceneScriptNR08::SceneFrameAdvanced(int frame) {
&& frame < 135
) {
Set_Fade_Density((134 - frame) / 14.0f);
- Music_Play(7, 61, 0, 1, -1, 0, 0);
+ Music_Play(kMusicArkDnce1, 61, 0, 1, -1, 0, 0);
} else {
Actor_Set_Invisible(kActorMcCoy, false);
Set_Fade_Density(0.0f);
@@ -199,6 +199,7 @@ void SceneScriptNR08::PlayerWalkedIn() {
) {
Game_Flag_Set(kFlagNR08DektoraShow);
Ambient_Sounds_Play_Sound(566, 27, 0, 99, 0);
+ Music_Play(kMusicArkdFly1, 61, 0, 1, -1, 0, 0);
Outtake_Play(kOuttakeDektora, true, -1);
} else {
Music_Adjust(51, 0, 2);
@@ -247,15 +248,15 @@ void SceneScriptNR08::playNextMusic() {
if (Music_Is_Playing()) {
Music_Adjust(51, 0, 2);
} else if (Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraNR08Dance) {
- Music_Play(6, 61, 0, 1, -1, 0, 0);
+ Music_Play(kMusicArkdFly1, 61, 0, 1, -1, 0, 0);
} else {
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
if (track == 0) {
- Music_Play(16, 61, -80, 2, -1, 0, 0);
+ Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
} else if (track == 1) {
- Music_Play(15, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
} else if (track == 2) {
- Music_Play(7, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
}
track++;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr09.cpp b/engines/bladerunner/script/scene/nr09.cpp
index df816c1901..d06c99082f 100644
--- a/engines/bladerunner/script/scene/nr09.cpp
+++ b/engines/bladerunner/script/scene/nr09.cpp
@@ -131,11 +131,11 @@ void SceneScriptNR09::playNextMusic() {
} else {
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
if (track == 0) {
- Music_Play(16, 61, -80, 2, -1, 0, 0);
+ Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
} else if (track == 1) {
- Music_Play(15, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
} else if (track == 2) {
- Music_Play(7, 41, -80, 2, -1, 0, 0);
+ Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
}
track++;
if (track > 2) {
diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp
index 99f2bc7bf6..a8b59dacfb 100644
--- a/engines/bladerunner/script/scene/nr11.cpp
+++ b/engines/bladerunner/script/scene/nr11.cpp
@@ -169,7 +169,7 @@ bool SceneScriptNR11::ClickedOn3DObject(const char *objectName, bool combatMode)
if (Actor_Query_Friendliness_To_Other(kActorDektora, kActorMcCoy) > 59
&& Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsNone
) {
- Music_Play(21, 35, 0, 3, -1, 0, 0);
+ Music_Play(kMusicLoveSong, 35, 0, 3, -1, 0, 0);
}
Loop_Actor_Walk_To_XYZ(kActorDektora, -135.0f, 0.33f, -267.0f, 0, false, false, 0);
Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp
index a82f88de0b..493c3c7950 100644
--- a/engines/bladerunner/script/scene/tb02.cpp
+++ b/engines/bladerunner/script/scene/tb02.cpp
@@ -304,7 +304,7 @@ void SceneScriptTB02::PlayerWalkedIn() {
if (Actor_Query_Goal_Number(kActorTyrellGuard) == kGoalTyrellGuardSleeping) {
Actor_Set_Goal_Number(kActorTyrellGuard, kGoalTyrellGuardWakeUp);
}
- Music_Play(1, 50, 0, 2, -1, 0, 0);
+ Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
} else {
Loop_Actor_Travel_Stairs(kActorMcCoy, 9, true, kAnimationModeIdle);
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -140.0f, 0.79f, 1470.0f, 0, false, false, 0);
diff --git a/engines/bladerunner/script/scene/ug01.cpp b/engines/bladerunner/script/scene/ug01.cpp
index e9652f511c..5ee9623281 100644
--- a/engines/bladerunner/script/scene/ug01.cpp
+++ b/engines/bladerunner/script/scene/ug01.cpp
@@ -171,7 +171,7 @@ void SceneScriptUG01::PlayerWalkedIn() {
}
if (Actor_Query_Goal_Number(kActorLucy) == kGoalLucyUG01Wait) {
- Music_Play(21, 35, 0, 3, -1, 0, 0);
+ Music_Play(kMusicLoveSong, 35, 0, 3, -1, 0, 0);
Actor_Set_Goal_Number(kActorLucy, 311);
}
//return false;
diff --git a/engines/bladerunner/ui/end_credits.cpp b/engines/bladerunner/ui/end_credits.cpp
index 1e9a3acfad..cab3aa2dc8 100644
--- a/engines/bladerunner/ui/end_credits.cpp
+++ b/engines/bladerunner/ui/end_credits.cpp
@@ -26,6 +26,7 @@
#include "audio/mixer.h"
#include "bladerunner/bladerunner.h"
+#include "bladerunner/game_constants.h"
#include "bladerunner/ambient_sounds.h"
#include "bladerunner/audio_speech.h"
#include "bladerunner/font.h"
@@ -52,7 +53,7 @@ void EndCredits::show() {
_vm->_ambientSounds->removeAllLoopingSounds(4);
_vm->_audioSpeech->stopSpeech();
- _vm->_music->play(_vm->_gameInfo->getMusicTrack(17), 100, 0, 2, -1, 0, 3);
+ _vm->_music->play(_vm->_gameInfo->getMusicTrack(kMusicCredits), 100, 0, 2, -1, 0, 3);
Font *fontBig = new Font(_vm);
fontBig->open("TAHOMA24.FON", 640, 480, -1, 0, 0);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 21:17:25 +0000