mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-10 12:55:24 +00:00
BLADERUNNER: RESTORED CONTENT: Start some music at random second
This commit is contained in:
antoniou79
parent
45d9ee85d2
commit
7a2a53b9ff
@ -640,7 +640,7 @@ bool Debugger::cmdMusic(int argc, const char** argv) {
|
||||
}
|
||||
return true;
|
||||
} else if (trackArgStr == "stop") {
|
||||
_vm->_music->stop(0);
|
||||
_vm->_music->stop(0u);
|
||||
//_vm->_ambientSounds->removeLoopingSound(kSfxMUSBLEED, 0);
|
||||
} else {
|
||||
int musicId = atoi(argv[1]);
|
||||
@ -651,8 +651,8 @@ bool Debugger::cmdMusic(int argc, const char** argv) {
|
||||
debugPrintf("Invalid music track id specified.\nPlease choose an integer between 0 and %d.\n", (int)_vm->_gameInfo->getMusicTrackCount() - 1);
|
||||
return true;
|
||||
} else {
|
||||
_vm->_music->stop(0);
|
||||
_vm->_music->play(_vm->_gameInfo->getMusicTrack(musicId), 100, 0, 0, -1, 0, 0);
|
||||
_vm->_music->stop(0u);
|
||||
_vm->_music->play(_vm->_gameInfo->getMusicTrack(musicId), 100, 0, 0, -1, kMusicLoopPlayOnce, 0);
|
||||
//debugPrintf("Now playing track %2d - \"%s\" (%s)\n", musicId, kMusicTracksArr[musicId], _vm->_gameInfo->getMusicTrack(musicId).c_str());
|
||||
debugPrintf("Now playing track %2d - \"%s\"\n", musicId, kMusicTracksArr[musicId]);
|
||||
}
|
||||
|
||||
@ -218,7 +218,7 @@ void AIScriptGordo::CompletedMovementTrack() {
|
||||
}
|
||||
|
||||
if (Actor_Query_Goal_Number(kActorGordo) == kGoalGordoNR01RunAway) {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
Actor_Set_Goal_Number(kActorGordo, kGoalGordoNR01RanAway);
|
||||
}
|
||||
// return false;
|
||||
@ -323,7 +323,7 @@ void AIScriptGordo::Retired(int byActorId) {
|
||||
#endif // BLADERUNNER_ORIGINAL_BUGS
|
||||
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false);
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagKP07toKP06);
|
||||
Game_Flag_Reset(kFlagMcCoyIsHelpingReplicants);
|
||||
Set_Enter(kSetKP05_KP06, kSceneKP06);
|
||||
@ -572,7 +572,7 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
|
||||
Actor_Face_Actor(kActorGordo, kActorMcCoy, true);
|
||||
Actor_Says(kActorGordo, 720, 16);
|
||||
Actor_Says(kActorGordo, 730, 18);
|
||||
Music_Stop(1);
|
||||
Music_Stop(1u);
|
||||
Actor_Face_Actor(kActorMcCoy, kActorGordo, true);
|
||||
Actor_Says(kActorGordo, 740, 17);
|
||||
Sound_Play(kSfxRIMSHOT1, 50, 0, 0, 50);
|
||||
@ -626,7 +626,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(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicBatl226M, 50, 0, 2, -1, kMusicLoopPlayOnce, 0);
|
||||
break;
|
||||
|
||||
case kGoalGordoNR02RunAway2:
|
||||
@ -719,7 +719,7 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
|
||||
break;
|
||||
|
||||
case kGoalGordoNR01Die:
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
AI_Countdown_Timer_Reset(kActorGordo, kActorTimerAIScriptCustomTask0);
|
||||
ADQ_Flush();
|
||||
AI_Movement_Track_Flush(kActorGordo);
|
||||
@ -1786,7 +1786,7 @@ void AIScriptGordo::talkToMcCoyAtNR02() {
|
||||
}
|
||||
|
||||
void AIScriptGordo::dialogue2() {
|
||||
Music_Stop(5);
|
||||
Music_Stop(5u);
|
||||
Dialogue_Menu_Clear_List();
|
||||
DM_Add_To_List_Never_Repeat_Once_Selected(820, -1, 5, 7); // ARREST
|
||||
DM_Add_To_List_Never_Repeat_Once_Selected(830, 7, 5, -1); // LET GO
|
||||
|
||||
@ -41,7 +41,12 @@ enum kAR01Exits {
|
||||
};
|
||||
|
||||
void SceneScriptAR01::InitializeScene() {
|
||||
Music_Play(kMusicArabLoop, 25, 0, 2, -1, 1, 2);
|
||||
if (_vm->_cutContent) {
|
||||
Music_Play(kMusicArabLoop, 25, 0, 2, -1, kMusicLoopRepeatRandomStart, 2);
|
||||
} else {
|
||||
Music_Play(kMusicArabLoop, 25, 0, 2, -1, kMusicLoopRepeat, 2);
|
||||
}
|
||||
|
||||
if (Game_Flag_Query(kFlagHC01toAR01)) {
|
||||
Setup_Scene_Information(-477.0f, 0.0f, -149.0f, 333);
|
||||
} else if (Game_Flag_Query(kFlagAR02toAR01)) {
|
||||
@ -74,10 +79,10 @@ void SceneScriptAR01::InitializeScene() {
|
||||
Ambient_Sounds_Add_Sound(kSfxHCANM6, 3, 30, 11, 11, 50, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxHCANM7, 3, 30, 11, 11, 50, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxHCANM1, 3, 30, 11, 11, 50, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 10, 180, 16, 25, 0, 0, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 10, 180, 16, 25, 0, 0, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxTHNDER2, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0);
|
||||
@ -454,9 +459,9 @@ void SceneScriptAR01::PlayerWalkedIn() {
|
||||
void SceneScriptAR01::PlayerWalkedOut() {
|
||||
Actor_Set_Invisible(kActorMcCoy, false);
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
if (!Game_Flag_Query(kFlagMcCoyInHawkersCircle)) {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
}
|
||||
if (!Game_Flag_Query(kFlagAR01toHC01)
|
||||
&& !Game_Flag_Query(kFlagAR01toAR02)
|
||||
|
||||
@ -25,7 +25,11 @@
|
||||
namespace BladeRunner {
|
||||
|
||||
void SceneScriptAR02::InitializeScene() {
|
||||
Music_Play(kMusicArabLoop, 22, 0, 2, -1, 1, 2);
|
||||
if (_vm->_cutContent) {
|
||||
Music_Play(kMusicArabLoop, 22, 0, 2, -1, kMusicLoopRepeatRandomStart, 2);
|
||||
} else {
|
||||
Music_Play(kMusicArabLoop, 22, 0, 2, -1, kMusicLoopRepeat, 2);
|
||||
}
|
||||
if (Game_Flag_Query(kFlagRC03toAR02)) {
|
||||
Setup_Scene_Information(-560.0f, 0.0f, -799.0f, 333);
|
||||
} else {
|
||||
@ -53,10 +57,10 @@ void SceneScriptAR02::InitializeScene() {
|
||||
Ambient_Sounds_Add_Sound(kSfxHCANM6, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxHCANM7, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxHCANM1, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 24, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 10, 180, 16, 25, 0, 0, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 10, 180, 16, 25, 0, 0, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxTHNDER2, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0);
|
||||
@ -352,7 +356,7 @@ bool SceneScriptAR02::ClickedOnExit(int exitId) {
|
||||
Game_Flag_Set(kFlagAR02toRC03);
|
||||
Game_Flag_Reset(kFlagMcCoyInAnimoidRow);
|
||||
Game_Flag_Set(kFlagMcCoyInRunciters);
|
||||
Music_Stop(3);
|
||||
Music_Stop(3u);
|
||||
Set_Enter(kSetRC03, kSceneRC03);
|
||||
}
|
||||
return true;
|
||||
@ -380,7 +384,7 @@ void SceneScriptAR02::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptAR02::PlayerWalkedOut() {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
}
|
||||
|
||||
void SceneScriptAR02::DialogueQueueFlushed(int a1) {
|
||||
|
||||
@ -91,7 +91,7 @@ bool SceneScriptBB11::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 43.39f, -10.27f, -68.52f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagBB11toBB10);
|
||||
Set_Enter(kSetBB10, kSceneBB10);
|
||||
}
|
||||
@ -138,14 +138,14 @@ void SceneScriptBB11::PlayerWalkedIn() {
|
||||
) {
|
||||
Actor_Set_Invisible(kActorMcCoy, true);
|
||||
Actor_Set_Goal_Number(kActorSadik, kGoalSadikBB11ThrowMcCoy);
|
||||
Music_Play(kMusicBeating1, 61, 0, 1, -1, 0, 0);
|
||||
Music_Play(kMusicBeating1, 61, 0, 1, -1, kMusicLoopPlayOnce, 0);
|
||||
Player_Loses_Control();
|
||||
}
|
||||
}
|
||||
|
||||
void SceneScriptBB11::PlayerWalkedOut() {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
}
|
||||
|
||||
void SceneScriptBB11::DialogueQueueFlushed(int a1) {
|
||||
|
||||
@ -42,7 +42,11 @@ enum kCT01Exits {
|
||||
};
|
||||
|
||||
void SceneScriptCT01::InitializeScene() {
|
||||
Music_Play(kMusicKyoto, 28, 0, 2, -1, 1, 0);
|
||||
int loop = kMusicLoopRepeat;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopRepeatRandomStart;
|
||||
}
|
||||
Music_Play(kMusicKyoto, 28, 0, 2, -1, loop, 0);
|
||||
Game_Flag_Reset(kFlagArrivedFromSpinner1);
|
||||
if (Game_Flag_Query(kFlagCT02toCT01)) {
|
||||
Game_Flag_Reset(kFlagCT02toCT01);
|
||||
@ -113,10 +117,10 @@ void SceneScriptCT01::InitializeScene() {
|
||||
Ambient_Sounds_Add_Sound(kSfxDISH2, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxDISH3, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxDISH4, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxTHNDER2, 20, 40, 33, 50, -100, 100, -101, -101, 0, 0);
|
||||
@ -534,23 +538,23 @@ void SceneScriptCT01::PlayerWalkedIn() {
|
||||
void SceneScriptCT01::PlayerWalkedOut() {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
if (Game_Flag_Query(kFlagCT01toCT12)) {
|
||||
Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBL1, 1);
|
||||
Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBR1, 1);
|
||||
Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBL1, 1u);
|
||||
Ambient_Sounds_Remove_Looping_Sound(kSfxCTAMBR1, 1u);
|
||||
} else {
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
}
|
||||
Music_Stop(5);
|
||||
Music_Stop(5u);
|
||||
#if BLADERUNNER_ORIGINAL_BUGS
|
||||
if (!Game_Flag_Query(kFlagMcCoyInChinaTown) && Global_Variable_Query(kVariableChapter) == 1) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Outtake_Play(kOuttakeTowards3, true, -1);
|
||||
}
|
||||
#else
|
||||
// Acts 2, 3 - should still use a spinner fly-through transition
|
||||
// also removed the redundant Ambient_Sounds_Remove_All_Non_Looping_Sounds
|
||||
if (!Game_Flag_Query(kFlagMcCoyInChinaTown)) {
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
if (!Game_Flag_Query(kFlagMcCoyInTyrellBuilding)) {
|
||||
// don't play this outtake when going to Tyrell Building
|
||||
Outtake_Play(kOuttakeTowards3, true, -1); // available in Acts 1, 2, 3
|
||||
|
||||
@ -71,10 +71,10 @@ void SceneScriptCT02::InitializeScene() {
|
||||
Ambient_Sounds_Add_Sound(kSfxDISH2, 10, 30, 7, 7, 100, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxDISH3, 10, 30, 8, 8, 100, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxDISH4, 10, 30, 7, 7, 100, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 17, 19, 100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 17, 19, 100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 17, 19, 100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 17, 19, 100, 100, -101, -101, 1, 1);
|
||||
if (Game_Flag_Query(kFlagCT02PotTipped)) {
|
||||
Scene_Loop_Set_Default(kCT02LoopMainPotTipped);
|
||||
} else {
|
||||
@ -287,7 +287,7 @@ bool SceneScriptCT02::ClickedOnExit(int exitId) {
|
||||
if (exitId == kCT02ExitCT01) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -111.2f, -145.11f, 243.28f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagCT02toCT01walk);
|
||||
Game_Flag_Set(kFlagCT02toCT01);
|
||||
Set_Enter(kSetCT01_CT12, kSceneCT01);
|
||||
@ -303,7 +303,7 @@ bool SceneScriptCT02::ClickedOnExit(int exitId) {
|
||||
}
|
||||
if (!v1) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagCT02toCT03);
|
||||
Set_Enter(kSetCT03_CT04, kSceneCT03);
|
||||
}
|
||||
@ -341,7 +341,7 @@ void SceneScriptCT02::SceneFrameAdvanced(int frame) {
|
||||
Sound_Play(kSfxPOTSPL5, 60, -20, 40, 50);
|
||||
}
|
||||
if (frame == 61) {
|
||||
Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicBatl226M, 50, 0, 2, -1, kMusicLoopPlayOnce, 0);
|
||||
}
|
||||
if (frame == 81) {
|
||||
Scene_Exit_Add_2D_Exit(kCT02ExitCT03, 332, 163, 404, 297, 0);
|
||||
|
||||
@ -122,7 +122,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(kMusicMoraji, 71, 0, 0, -1, 0, 2);
|
||||
Music_Play(kMusicMoraji, 71, 0, 0, -1, kMusicLoopPlayOnce, 2);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@ -208,7 +208,7 @@ void SceneScriptDR05::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptDR05::PlayerWalkedOut() {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
|
||||
if (Actor_Query_Goal_Number(kActorMoraji) == kGoalMorajiFreed
|
||||
|| Actor_Query_Goal_Number(kActorMoraji) == kGoalMorajiGetUp
|
||||
|
||||
@ -25,7 +25,11 @@
|
||||
namespace BladeRunner {
|
||||
|
||||
void SceneScriptHC01::InitializeScene() {
|
||||
Music_Play(kMusicArabLoop, 31, 0, 2, -1, 1, 2);
|
||||
int loop = kMusicLoopRepeat;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopRepeatRandomStart;
|
||||
}
|
||||
Music_Play(kMusicArabLoop, 31, 0, 2, -1, loop, 2);
|
||||
if (Game_Flag_Query(kFlagHC02toHC01)) {
|
||||
Setup_Scene_Information( 64.0f, 0.14f, 83.0f, 266);
|
||||
} else if (Game_Flag_Query(kFlagHC03toHC01)) {
|
||||
@ -166,7 +170,7 @@ bool SceneScriptHC01::ClickedOnItem(int itemId, bool a2) {
|
||||
bool SceneScriptHC01::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 814.0f, 0.14f, 153.0f, 0, true, false, false)) {
|
||||
Music_Adjust(12, 0, 2);
|
||||
Music_Adjust(12, 0, 2u);
|
||||
Game_Flag_Set(kFlagHC01toAR01);
|
||||
Set_Enter(kSetAR01_AR02, kSceneAR01);
|
||||
Game_Flag_Reset(kFlagMcCoyInHawkersCircle);
|
||||
@ -263,7 +267,7 @@ void SceneScriptHC01::PlayerWalkedIn() {
|
||||
void SceneScriptHC01::PlayerWalkedOut() {
|
||||
Set_Fade_Density(0.0f);
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
}
|
||||
|
||||
void SceneScriptHC01::DialogueQueueFlushed(int a1) {
|
||||
|
||||
@ -25,7 +25,11 @@
|
||||
namespace BladeRunner {
|
||||
|
||||
void SceneScriptHC02::InitializeScene() {
|
||||
Music_Play(kMusicOneTime, 45, -60, 1, -1, 1, 3);
|
||||
int loop = kMusicLoopRepeat;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopRepeatRandomStart;
|
||||
}
|
||||
Music_Play(kMusicOneTime, 45, -60, 1, -1, loop, 3);
|
||||
if (Game_Flag_Query(kFlagHC04toHC02)) {
|
||||
Setup_Scene_Information(-88.0f, 0.14f, -463.0f, 540);
|
||||
} else {
|
||||
@ -179,7 +183,7 @@ bool SceneScriptHC02::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 7.0f, 0.14f, 79.0f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagHC02toHC01);
|
||||
Set_Enter(kSetHC01_HC02_HC03_HC04, kSceneHC01);
|
||||
}
|
||||
@ -189,7 +193,7 @@ bool SceneScriptHC02::ClickedOnExit(int exitId) {
|
||||
if (exitId == 1) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -76.0f, 0.14f, -339.0f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagHC02toHC04);
|
||||
Async_Actor_Walk_To_XYZ(kActorMcCoy, -88.0f, 0.14f, -463.0f, 0, false);
|
||||
Set_Enter(kSetHC01_HC02_HC03_HC04, kSceneHC04);
|
||||
|
||||
@ -31,7 +31,11 @@ void SceneScriptHC04::InitializeScene() {
|
||||
} else {
|
||||
Setup_Scene_Information(-88.0f, 0.14f, -463.0f, 1013);
|
||||
}
|
||||
Music_Play(kMusicOneTime, 14, -90, 1, -1, 1, 2);
|
||||
int loop = kMusicLoopRepeat;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopRepeatRandomStart;
|
||||
}
|
||||
Music_Play(kMusicOneTime, 14, -90, 1, -1, loop, 2);
|
||||
|
||||
Actor_Put_In_Set(kActorIsabella, kSetHC01_HC02_HC03_HC04);
|
||||
Actor_Set_At_XYZ(kActorIsabella, -210.0f, 0.0f, -445.0f, 250);
|
||||
@ -119,7 +123,7 @@ bool SceneScriptHC04::ClickedOnItem(int itemId, bool a2) {
|
||||
bool SceneScriptHC04::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -108.0f, 0.14f, -639.0f, 0, true, false, false)) {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
Game_Flag_Set(kFlagHC04toRC03);
|
||||
Game_Flag_Reset(kFlagMcCoyInHawkersCircle);
|
||||
Game_Flag_Set(kFlagMcCoyInRunciters);
|
||||
@ -153,7 +157,7 @@ void SceneScriptHC04::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptHC04::PlayerWalkedOut() {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
}
|
||||
|
||||
void SceneScriptHC04::DialogueQueueFlushed(int a1) {
|
||||
|
||||
@ -95,7 +95,7 @@ bool SceneScriptHF04::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1132.27f, -0.31f, -113.46f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagHF04toHF03);
|
||||
Set_Enter(kSetHF02, kSceneHF02);
|
||||
}
|
||||
@ -171,14 +171,14 @@ void SceneScriptHF04::PlayerWalkedIn() {
|
||||
|| Actor_Query_Goal_Number(kActorLucy) == kGoalLucyHF04Run1
|
||||
) {
|
||||
Player_Set_Combat_Mode(true);
|
||||
Music_Play(kMusicBatl226M, 60, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicBatl226M, 60, 0, 2, -1, kMusicLoopPlayOnce, 0);
|
||||
}
|
||||
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -45.0f, -0.31f, 307.0f, 0, false, true, false);
|
||||
Delay(2500);
|
||||
}
|
||||
|
||||
void SceneScriptHF04::PlayerWalkedOut() {
|
||||
Music_Stop(5);
|
||||
Music_Stop(5u);
|
||||
}
|
||||
|
||||
void SceneScriptHF04::DialogueQueueFlushed(int a1) {
|
||||
|
||||
@ -257,7 +257,7 @@ void SceneScriptHF05::SceneFrameAdvanced(int frame) {
|
||||
|
||||
case 179:
|
||||
Sound_Play(kSfxCAREXPL1, 90, 0, 0, 50);
|
||||
Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicBatl226M, 50, 0, 2, -1, kMusicLoopPlayOnce, 0);
|
||||
break;
|
||||
|
||||
case 186:
|
||||
@ -326,7 +326,7 @@ void SceneScriptHF05::PlayerWalkedIn() {
|
||||
&& !Game_Flag_Query(kFlagHF05PoliceArrived)
|
||||
) {
|
||||
Game_Flag_Set(kFlagHF05PoliceArrived);
|
||||
Music_Play(kMusicBatl226M, 40, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicBatl226M, 40, 0, 2, -1, kMusicLoopPlayOnce, 0);
|
||||
Actor_Says(kActorOfficerGrayford, 200, kAnimationModeTalk);
|
||||
Actor_Says(kActorOfficerGrayford, 210, kAnimationModeTalk);
|
||||
Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyPoliceWait120SecondsToAttackHF05);
|
||||
@ -370,7 +370,7 @@ void SceneScriptHF05::PlayerWalkedOut() {
|
||||
Actor_Set_Goal_Number(kActorCrazylegs, kGoalCrazyLegsLeavesShowroom);
|
||||
}
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
}
|
||||
|
||||
void SceneScriptHF05::DialogueQueueFlushed(int a1) {
|
||||
@ -791,15 +791,15 @@ void SceneScriptHF05::talkWithCrazyLegs1() {
|
||||
|
||||
void SceneScriptHF05::addAmbientSounds() {
|
||||
Ambient_Sounds_Add_Sound(kSfxSIREN2, 20, 80, 20, 100, -100, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 250, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 330, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 340, 5, 90, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 360, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 80, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 160, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 280, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 250, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 330, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 340, 5u, 90u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 360, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 80, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 160, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 280, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
}
|
||||
|
||||
int SceneScriptHF05::getCompanionActor() {
|
||||
|
||||
@ -147,7 +147,7 @@ bool SceneScriptHF06::ClickedOnExit(int exitId) {
|
||||
Actor_Face_Heading(kActorMcCoy, 730, false);
|
||||
Loop_Actor_Travel_Stairs(kActorMcCoy, 2, false, kAnimationModeIdle);
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagHF06toHF05);
|
||||
Set_Enter(kSetHF05, kSceneHF05);
|
||||
}
|
||||
@ -186,7 +186,7 @@ void SceneScriptHF06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
|
||||
}
|
||||
|
||||
if (otherActorId != -1) {
|
||||
Music_Play(kMusicLoveSong, 35, 0, 3, -1, 0, 0);
|
||||
Music_Play(kMusicLoveSong, 35, 0, 3, -1, kMusicLoopPlayOnce, 0);
|
||||
Player_Set_Combat_Mode(false);
|
||||
Delay(1000);
|
||||
Actor_Voice_Over(990, kActorVoiceOver);
|
||||
@ -248,7 +248,7 @@ void SceneScriptHF06::PlayerWalkedIn() {
|
||||
}
|
||||
|
||||
void SceneScriptHF06::PlayerWalkedOut() {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
}
|
||||
|
||||
void SceneScriptHF06::DialogueQueueFlushed(int a1) {
|
||||
@ -316,15 +316,15 @@ void SceneScriptHF06::steelInterruption() {
|
||||
|
||||
void SceneScriptHF06::addAmbientSounds() {
|
||||
Ambient_Sounds_Add_Sound(kSfxSIREN2, 20, 80, 20, 100, -100, 100, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 250, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 330, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 340, 5, 90, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 360, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 80, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 160, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 280, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 250, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 330, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 340, 5u, 90u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary, 360, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 80, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 160, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorDispatcher, 280, 5u, 70u, 7, 10, -50, 50, -101, -101, 1, 1);
|
||||
}
|
||||
|
||||
} // End of namespace BladeRunner
|
||||
|
||||
@ -156,8 +156,8 @@ bool SceneScriptKP03::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1.0f, -36.55f, 111.0f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Music_Stop(2);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Music_Stop(2u);
|
||||
Game_Flag_Reset(kFlagKP01toKP03);
|
||||
Game_Flag_Reset(kFlagKP05toKP03);
|
||||
Game_Flag_Set(kFlagKP03toKP05);
|
||||
@ -169,8 +169,8 @@ bool SceneScriptKP03::ClickedOnExit(int exitId) {
|
||||
if (exitId == 1) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -321.0f, -36.55f, 26.0f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Music_Stop(2);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Music_Stop(2u);
|
||||
Game_Flag_Reset(kFlagKP01toKP03);
|
||||
Game_Flag_Reset(kFlagKP05toKP03);
|
||||
Game_Flag_Set(kFlagKP03toKP01);
|
||||
@ -242,7 +242,7 @@ void SceneScriptKP03::SceneFrameAdvanced(int frame) {
|
||||
|
||||
if (bombTriggeredByActor == kActorSteele) {
|
||||
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleKP03Exploded);
|
||||
Music_Play(kMusicCrysDie1, 25, 0, 1, -1, 0, 0);
|
||||
Music_Play(kMusicCrysDie1, 25, 0, 1, -1, kMusicLoopPlayOnce, 0);
|
||||
if (Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorSteele) <= 120) {
|
||||
bombTriggeredByActor = kActorMcCoy;
|
||||
}
|
||||
@ -318,7 +318,7 @@ void SceneScriptKP03::saveSteele() {
|
||||
Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1.0f, -36.55f, 111.0f, 0, false, false, false);
|
||||
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleKP05Enter);
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Reset(kFlagKP01toKP03);
|
||||
Game_Flag_Reset(kFlagKP05toKP03);
|
||||
Game_Flag_Set(kFlagKP03toKP05);
|
||||
|
||||
@ -146,7 +146,7 @@ void SceneScriptKP07::InitializeScene() {
|
||||
|
||||
void SceneScriptKP07::SceneLoaded() {
|
||||
if (!Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
|
||||
Music_Play(kMusicClovDie1, 25, 0, 0, -1, 1, 0);
|
||||
Music_Play(kMusicClovDie1, 25, 0, 0, -1, kMusicLoopRepeat, 0);
|
||||
}
|
||||
Obstacle_Object("BUNK_TRAY01", true);
|
||||
Unobstacle_Object("BUNK_TRAY01", true);
|
||||
@ -177,7 +177,7 @@ bool SceneScriptKP07::ClickedOnActor(int actorId) {
|
||||
if (Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
|
||||
Actor_Set_Goal_Number(kActorClovis, kGoalClovisKP07FlyAway);
|
||||
} else {
|
||||
Music_Play(kMusicClovDies, 31, 0, 0, -1, 1, 0);
|
||||
Music_Play(kMusicClovDies, 31, 0, 0, -1, kMusicLoopRepeat, 0);
|
||||
Actor_Set_Goal_Number(kActorClovis, kGoalClovisKP07TalkToMcCoy);
|
||||
}
|
||||
return true;
|
||||
@ -207,7 +207,7 @@ bool SceneScriptKP07::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagKP07toKP06);
|
||||
Set_Enter(kSetKP05_KP06, kSceneKP06);
|
||||
}
|
||||
@ -250,7 +250,7 @@ void SceneScriptKP07::PlayerWalkedIn() {
|
||||
}
|
||||
|
||||
void SceneScriptKP07::PlayerWalkedOut() {
|
||||
Music_Stop(3);
|
||||
Music_Stop(3u);
|
||||
}
|
||||
|
||||
void SceneScriptKP07::DialogueQueueFlushed(int a1) {
|
||||
|
||||
@ -139,7 +139,7 @@ bool SceneScriptMA02::ClickedOnItem(int itemId, bool a2) {
|
||||
bool SceneScriptMA02::ClickedOnExit(int exitId) {
|
||||
if (exitId == kMA02ExitMA06) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.19f, -144.12f, 378.27f, 0, true, false, false)) {
|
||||
Music_Stop(10);
|
||||
Music_Stop(10u);
|
||||
Game_Flag_Set(kFlagMA02toMA06);
|
||||
Set_Enter(kSetMA06, kSceneMA06);
|
||||
}
|
||||
@ -193,7 +193,11 @@ void SceneScriptMA02::PlayerWalkedIn() {
|
||||
) {
|
||||
if (Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
|
||||
Actor_Says(kActorMcCoy, 2390, kAnimationModeIdle);
|
||||
Music_Play(kMusicBRBlues, 25, 0, 3, -1, 0, 0);
|
||||
if (_vm->_cutContent) {
|
||||
Music_Play(kMusicBRBlues, 25, 0, 3, -1, kMusicLoopPlayOnceRandomStart, 0);
|
||||
} else {
|
||||
Music_Play(kMusicBRBlues, 25, 0, 3, -1, kMusicLoopPlayOnce, 0);
|
||||
}
|
||||
} else {
|
||||
Actor_Says(kActorMcCoy, 2385, kAnimationModeTalk);
|
||||
}
|
||||
@ -230,7 +234,7 @@ void SceneScriptMA02::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptMA02::PlayerWalkedOut() {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
}
|
||||
|
||||
void SceneScriptMA02::DialogueQueueFlushed(int a1) {
|
||||
|
||||
@ -190,7 +190,11 @@ bool SceneScriptMA04::ClickedOn2DRegion(int region) {
|
||||
} else {
|
||||
phoneCallWithSteele();
|
||||
}
|
||||
Music_Play(kMusicBRBlues, 52, 0, 3, -1, 0, 0);
|
||||
if (_vm->_cutContent) {
|
||||
Music_Play(kMusicBRBlues, 52, 0, 3, -1, kMusicLoopPlayOnceRandomStart, 0);
|
||||
} else {
|
||||
Music_Play(kMusicBRBlues, 52, 0, 3, -1, kMusicLoopPlayOnce, 0);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if (Actor_Clue_Query(kActorClovis, kClueMcCoyRetiredZuben) && !Game_Flag_Query(kFlagMA04PhoneMessageFromClovis)) {
|
||||
@ -303,7 +307,7 @@ void SceneScriptMA04::PlayerWalkedIn() {
|
||||
return;
|
||||
}
|
||||
if ((Game_Flag_Query(kFlagZubenRetired) || Game_Flag_Query(kFlagZubenSpared)) && !Game_Flag_Query(kFlagChapter1Ending)) {
|
||||
Music_Play(kMusicBRBlues, 52, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicBRBlues, 52, 0, 2, -1, kMusicLoopPlayOnce, 0);
|
||||
Player_Loses_Control();
|
||||
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 955.0f, 1677.0f, 0, true, false, false);
|
||||
if (isPhoneMessageWaiting() || isPhoneRinging()) {
|
||||
@ -319,10 +323,10 @@ void SceneScriptMA04::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptMA04::PlayerWalkedOut() {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
if (Game_Flag_Query(kFlagChapter2Intro)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Outtake_Play(kOuttakeMovieA, false, -1);
|
||||
Game_Flag_Reset(kFlagChapter2Intro);
|
||||
}
|
||||
@ -588,7 +592,7 @@ void SceneScriptMA04::turnOnTV() {
|
||||
void SceneScriptMA04::sleep() {
|
||||
if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BED-SHEETS", 12, true, false)) {
|
||||
Actor_Says(kActorMcCoy, 8530, 12);
|
||||
Music_Stop(4);
|
||||
Music_Stop(4u);
|
||||
if (isPhoneMessageWaiting() || isPhoneRinging()) {
|
||||
Overlay_Remove("MA04OVER");
|
||||
}
|
||||
|
||||
@ -48,10 +48,10 @@ void SceneScriptMA05::InitializeScene() {
|
||||
Ambient_Sounds_Add_Looping_Sound(kSfxROOFRAN1, 90, 0, 1);
|
||||
Ambient_Sounds_Add_Looping_Sound(kSfxROOFAIR1, 40, -100, 1);
|
||||
Ambient_Sounds_Add_Looping_Sound(kSfxRAINAWN1, 50, 60, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10u, 260u, 27, 47, -100, 100, -101, -101, 1, 1);
|
||||
Ambient_Sounds_Add_Sound(kSfxSPIN2B, 10, 100, 25, 50, 0, 0, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxSPIN3A, 10, 100, 25, 50, 0, 0, -101, -101, 0, 0);
|
||||
Ambient_Sounds_Add_Sound(kSfxTHNDER2, 10, 70, 50, 100, 0, 0, -101, -101, 0, 0);
|
||||
@ -94,7 +94,7 @@ bool SceneScriptMA05::ClickedOnExit(int exitId) {
|
||||
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 956.17f, 1579.0f, 0, false, false, false);
|
||||
Game_Flag_Set(kFlagMA05toMA04);
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Async_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 953.97f, 1685.0f, 0, false);
|
||||
Set_Enter(kSetMA04, kSceneMA04);
|
||||
}
|
||||
@ -118,7 +118,11 @@ void SceneScriptMA05::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
|
||||
}
|
||||
|
||||
void SceneScriptMA05::PlayerWalkedIn() {
|
||||
Music_Play(kMusicBRBlues, 52, 0, 2, -1, 0, 0);
|
||||
int loop = kMusicLoopPlayOnce;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopPlayOnceRandomStart;
|
||||
}
|
||||
Music_Play(kMusicBRBlues, 52, 0, 2, -1, loop, 0);
|
||||
if ((Random_Query(0, 4) == 1 || (Game_Flag_Query(kFlagChapter1Ending) && !Game_Flag_Query(kFlagChapter1Ended))) && Global_Variable_Query(kVariableChapter) == 1) {
|
||||
Scene_Loop_Set_Default(kMA05LoopMainLoop);
|
||||
Scene_Loop_Start_Special(kSceneLoopModeOnce, kMA05LoopSpinner, true);
|
||||
|
||||
@ -142,10 +142,10 @@ bool SceneScriptNR02::ClickedOnExit(int exitId) {
|
||||
if (Actor_Query_Goal_Number(kActorGordo) < kGoalGordoNR01WaitAndAttack
|
||||
|| Actor_Query_Goal_Number(kActorGordo) > kGoalGordoNR01WaitAndTakeHostage
|
||||
) {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
}
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagNR02toNR01);
|
||||
Set_Enter(kSetNR01, kSceneNR01);
|
||||
}
|
||||
@ -191,7 +191,7 @@ void SceneScriptNR02::PlayerWalkedIn() {
|
||||
}
|
||||
|
||||
void SceneScriptNR02::PlayerWalkedOut() {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
|
||||
// Gordo on the podium
|
||||
if (Actor_Query_Goal_Number(kActorGordo) < kGoalGordoNR02TalkAboutMcCoy
|
||||
@ -244,12 +244,16 @@ void SceneScriptNR02::DialogueQueueFlushed(int a1) {
|
||||
|
||||
void SceneScriptNR02::playNextMusic() {
|
||||
int track = Global_Variable_Query(kVariableTaffyLewisMusic);
|
||||
int loop = kMusicLoopPlayOnce;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopPlayOnceRandomStart;
|
||||
}
|
||||
if (track == 0) {
|
||||
Music_Play(kMusicTaffy2, 41, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicTaffy2, 41, 0, 2, -1, loop, 0);
|
||||
} else if (track == 1) {
|
||||
Music_Play(kMusicTaffy3, 41, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicTaffy3, 41, 0, 2, -1, loop, 0);
|
||||
} else if (track == 2) {
|
||||
Music_Play(kMusicTaffy4, 41, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicTaffy4, 41, 0, 2, -1, loop, 0);
|
||||
}
|
||||
++track;
|
||||
if (track > 2) {
|
||||
|
||||
@ -144,7 +144,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 410.0f, -70.19f, -715.0f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagNR03toNR01);
|
||||
Set_Enter(kSetNR01, kSceneNR01);
|
||||
}
|
||||
@ -184,7 +184,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) {
|
||||
#endif
|
||||
} else {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagNR03toNR04);
|
||||
Set_Enter(kSetNR04, kSceneNR04);
|
||||
}
|
||||
@ -236,7 +236,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) {
|
||||
Actor_Face_Heading(kActorMcCoy, 656, false);
|
||||
Actor_Change_Animation_Mode(kActorMcCoy, 53);
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagNR03toNR05);
|
||||
Set_Enter(kSetNR05_NR08, kSceneNR05);
|
||||
Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kNR03LoopTableSwivel, false);
|
||||
@ -349,7 +349,7 @@ void SceneScriptNR03::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptNR03::PlayerWalkedOut() {
|
||||
if (!Game_Flag_Query(kFlagNR03toNR04)) {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
}
|
||||
if (Game_Flag_Query(kFlagNR03toNR05)) {
|
||||
Player_Gains_Control();
|
||||
@ -403,15 +403,19 @@ void SceneScriptNR03::rotateActorOnTable(int frame) {
|
||||
|
||||
void SceneScriptNR03::playNextMusic() {
|
||||
if (Music_Is_Playing()) {
|
||||
Music_Adjust(51, 0, 2);
|
||||
Music_Adjust(51, 0, 2u);
|
||||
} else {
|
||||
int track = Global_Variable_Query(kVariableEarlyQFrontMusic);
|
||||
int loop = kMusicLoopPlayOnce;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopPlayOnceRandomStart;
|
||||
}
|
||||
if (track == 0) {
|
||||
Music_Play(kMusicGothic2, 51, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicGothic2, 51, 0, 2, -1, loop, 0);
|
||||
} else if (track == 1) {
|
||||
Music_Play(kMusicGothic1, 51, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicGothic1, 51, 0, 2, -1, loop, 0);
|
||||
} else if (track == 2) {
|
||||
Music_Play(kMusicGothic3, 51, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicGothic3, 51, 0, 2, -1, loop, 0);
|
||||
}
|
||||
++track;
|
||||
if (track > 2) {
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
namespace BladeRunner {
|
||||
|
||||
void SceneScriptNR04::InitializeScene() {
|
||||
Music_Adjust(30, 80, 2);
|
||||
Music_Adjust(30, 80, 2u);
|
||||
|
||||
Setup_Scene_Information(53.0f, 0.0f, -110.0f, 569);
|
||||
|
||||
@ -155,7 +155,7 @@ bool SceneScriptNR04::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 45.0f, 0.0f, -106.0f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagNR04toNR03);
|
||||
Set_Enter(kSetNR03, kSceneNR03);
|
||||
}
|
||||
@ -319,8 +319,8 @@ void SceneScriptNR04::PlayerWalkedOut() {
|
||||
#else
|
||||
if (Game_Flag_Query(kFlagNR03McCoyThrownOut)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Music_Stop(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Music_Stop(1u);
|
||||
}
|
||||
#endif // BLADERUNNER_ORIGINAL_BUGS
|
||||
}
|
||||
@ -397,12 +397,16 @@ void SceneScriptNR04::druggedEffect(int frame) {
|
||||
|
||||
void SceneScriptNR04::playNextMusic() {
|
||||
int track = Global_Variable_Query(kVariableEarlyQFrontMusic);
|
||||
int loop = kMusicLoopPlayOnce;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopPlayOnceRandomStart;
|
||||
}
|
||||
if (track == 0) {
|
||||
Music_Play(kMusicGothic2, 11, 80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicGothic2, 11, 80, 2, -1, loop, 0);
|
||||
} else if (track == 1) {
|
||||
Music_Play(kMusicGothic1, 11, 80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicGothic1, 11, 80, 2, -1, loop, 0);
|
||||
} else if (track == 2) {
|
||||
Music_Play(kMusicGothic3, 11, 80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicGothic3, 11, 80, 2, -1, loop, 0);
|
||||
}
|
||||
++track;
|
||||
if (track > 2) {
|
||||
|
||||
@ -134,7 +134,7 @@ bool SceneScriptNR05::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -444.0f, 0.0f, -451.0f, 0, true, false, false)) {
|
||||
Player_Loses_Control();
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
Player_Set_Combat_Mode(false);
|
||||
Actor_Face_Heading(kActorMcCoy, 1021, false);
|
||||
Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeSit);
|
||||
@ -207,7 +207,7 @@ void SceneScriptNR05::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
|
||||
|
||||
void SceneScriptNR05::PlayerWalkedIn() {
|
||||
if (Game_Flag_Query(kFlagNR08toNR05)) {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -697.56f, 0.0f, -174.86f, 0, true, false, false);
|
||||
Game_Flag_Reset(kFlagNR08toNR05);
|
||||
}
|
||||
@ -216,10 +216,10 @@ void SceneScriptNR05::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptNR05::PlayerWalkedOut() {
|
||||
if (Game_Flag_Query(kFlagNR05toNR03)) {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
}
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
}
|
||||
|
||||
void SceneScriptNR05::DialogueQueueFlushed(int a1) {
|
||||
@ -408,15 +408,19 @@ void SceneScriptNR05::rotateActorOnGround(int actorId) {
|
||||
|
||||
void SceneScriptNR05::playNextMusic() {
|
||||
if (Music_Is_Playing()) {
|
||||
Music_Adjust(51, 0, 2);
|
||||
Music_Adjust(51, 0, 2u);
|
||||
} else {
|
||||
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
|
||||
int loop = kMusicLoopPlayOnce;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopPlayOnceRandomStart;
|
||||
}
|
||||
if (track == 0) {
|
||||
Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, loop, 0);
|
||||
} else if (track == 1) {
|
||||
Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicStrip1, 41, -80, 2, -1, loop, 0);
|
||||
} else if (track == 2) {
|
||||
Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicArkDnce1, 41, -80, 2, -1, loop, 0);
|
||||
}
|
||||
++track;
|
||||
if (track > 2) {
|
||||
|
||||
@ -97,7 +97,7 @@ bool SceneScriptNR06::ClickedOnExit(int exitId) {
|
||||
Loop_Actor_Travel_Stairs(kActorMcCoy, 8, true, kAnimationModeIdle);
|
||||
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -36.0f, 0.37f, -373.0f, 0, false, false, false);
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagNR06toNR08);
|
||||
Set_Enter(kSetNR05_NR08, kSceneNR08);
|
||||
}
|
||||
@ -135,7 +135,7 @@ void SceneScriptNR06::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptNR06::PlayerWalkedOut() {
|
||||
if (Game_Flag_Query(kFlagNR06toNR07)) {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
}
|
||||
}
|
||||
|
||||
@ -144,15 +144,19 @@ void SceneScriptNR06::DialogueQueueFlushed(int a1) {
|
||||
|
||||
void SceneScriptNR06::playNextMusic() {
|
||||
if (Music_Is_Playing()) {
|
||||
Music_Adjust(31, 80, 2);
|
||||
Music_Adjust(31, 80, 2u);
|
||||
} else {
|
||||
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
|
||||
int loop = kMusicLoopPlayOnce;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopPlayOnceRandomStart;
|
||||
}
|
||||
if (track == 0) {
|
||||
Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, loop, 0);
|
||||
} else if (track == 1) {
|
||||
Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicStrip1, 41, -80, 2, -1, loop, 0);
|
||||
} else if (track == 2) {
|
||||
Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicArkDnce1, 41, -80, 2, -1, loop, 0);
|
||||
}
|
||||
++track;
|
||||
if (track > 2) {
|
||||
|
||||
@ -38,7 +38,7 @@ void SceneScriptNR08::InitializeScene() {
|
||||
Scene_Loop_Set_Default(kNR08LoopMainLoop);
|
||||
Setup_Scene_Information(-1102.88f, 0.0f, 107.43f, 0);
|
||||
if (Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraNR08Dance) {
|
||||
Music_Stop(1);
|
||||
Music_Stop(1u);
|
||||
}
|
||||
} else if (Game_Flag_Query(kFlagNR06toNR08)) {
|
||||
Setup_Scene_Information( -724.7f, 0.0f, 384.24f, 1000);
|
||||
@ -149,7 +149,7 @@ void SceneScriptNR08::SceneFrameAdvanced(int frame) {
|
||||
&& frame < 91
|
||||
) {
|
||||
Set_Fade_Density((frame - 76) / 14.0f);
|
||||
Music_Stop(3);
|
||||
Music_Stop(3u);
|
||||
#if BLADERUNNER_ORIGINAL_BUGS
|
||||
Ambient_Sounds_Play_Sound(kSfxDEKCLAP1, 27, 0, 99, 0);
|
||||
#else
|
||||
@ -168,7 +168,7 @@ void SceneScriptNR08::SceneFrameAdvanced(int frame) {
|
||||
&& frame < 135
|
||||
) {
|
||||
Set_Fade_Density((134 - frame) / 14.0f);
|
||||
Music_Play(kMusicArkDnce1, 61, 0, 1, -1, 0, 0);
|
||||
Music_Play(kMusicArkDnce1, 61, 0, 1, -1, kMusicLoopPlayOnce, 0);
|
||||
} else {
|
||||
Actor_Set_Invisible(kActorMcCoy, false);
|
||||
Set_Fade_Density(0.0f);
|
||||
@ -207,10 +207,10 @@ void SceneScriptNR08::PlayerWalkedIn() {
|
||||
) {
|
||||
Game_Flag_Set(kFlagNR08DektoraShow);
|
||||
Ambient_Sounds_Play_Sound(kSfxDEKCLAP1, 27, 0, 99, 0);
|
||||
Music_Play(kMusicArkdFly1, 61, 0, 1, -1, 0, 0);
|
||||
Music_Play(kMusicArkdFly1, 61, 0, 1, -1, kMusicLoopPlayOnce, 0);
|
||||
Outtake_Play(kOuttakeDektora, true, -1);
|
||||
} else {
|
||||
Music_Adjust(51, 0, 2);
|
||||
Music_Adjust(51, 0, 2u);
|
||||
}
|
||||
|
||||
if (Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraNR08ReadyToRun) {
|
||||
@ -248,9 +248,9 @@ void SceneScriptNR08::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptNR08::PlayerWalkedOut() {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
if (!Game_Flag_Query(kFlagNR08toNR05)) {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
}
|
||||
}
|
||||
|
||||
@ -259,17 +259,21 @@ void SceneScriptNR08::DialogueQueueFlushed(int a1) {
|
||||
|
||||
void SceneScriptNR08::playNextMusic() {
|
||||
if (Music_Is_Playing()) {
|
||||
Music_Adjust(51, 0, 2);
|
||||
Music_Adjust(51, 0, 2u);
|
||||
} else if (Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraNR08Dance) {
|
||||
Music_Play(kMusicArkdFly1, 61, 0, 1, -1, 0, 0);
|
||||
Music_Play(kMusicArkdFly1, 61, 0, 1, -1, kMusicLoopPlayOnce, 0);
|
||||
} else {
|
||||
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
|
||||
int loop = kMusicLoopPlayOnce;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopPlayOnceRandomStart;
|
||||
}
|
||||
if (track == 0) {
|
||||
Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, loop, 0);
|
||||
} else if (track == 1) {
|
||||
Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicStrip1, 41, -80, 2, -1, loop, 0);
|
||||
} else if (track == 2) {
|
||||
Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicArkDnce1, 41, -80, 2, -1, loop, 0);
|
||||
}
|
||||
++track;
|
||||
if (track > 2) {
|
||||
|
||||
@ -27,7 +27,7 @@ namespace BladeRunner {
|
||||
void SceneScriptNR09::InitializeScene() {
|
||||
if (Game_Flag_Query(kFlagNR10toNR09)) {
|
||||
if (!Game_Flag_Query(kFlagNR10CameraDestroyed)) {
|
||||
Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 22, 100, 2);
|
||||
Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 22, 100, 2u);
|
||||
}
|
||||
Game_Flag_Reset(kFlagNR10toNR09);
|
||||
Setup_Scene_Information(-556.07f, 0.35f, 399.04f, 440);
|
||||
@ -84,7 +84,7 @@ bool SceneScriptNR09::ClickedOnExit(int exitId) {
|
||||
|
||||
if (exitId == 1) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
int v1 = Loop_Actor_Walk_To_XYZ(kActorMcCoy, -704.07f, 0.35f, 663.04f, 0, true, false, false);
|
||||
if (!v1) {
|
||||
Game_Flag_Set(kFlagNR09toNR08);
|
||||
@ -118,7 +118,7 @@ void SceneScriptNR09::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptNR09::PlayerWalkedOut() {
|
||||
if (Game_Flag_Query(kFlagNR09toNR10)) {
|
||||
Music_Stop(2);
|
||||
Music_Stop(2u);
|
||||
}
|
||||
}
|
||||
|
||||
@ -127,15 +127,19 @@ void SceneScriptNR09::DialogueQueueFlushed(int a1) {
|
||||
|
||||
void SceneScriptNR09::playNextMusic() {
|
||||
if (Music_Is_Playing()) {
|
||||
Music_Adjust(31, -80, 2);
|
||||
Music_Adjust(31, -80, 2u);
|
||||
} else {
|
||||
int track = Global_Variable_Query(kVariableEarlyQBackMusic);
|
||||
int loop = kMusicLoopPlayOnce;
|
||||
if (_vm->_cutContent && Random_Query(0, 2) == 1) {
|
||||
loop = kMusicLoopPlayOnceRandomStart;
|
||||
}
|
||||
if (track == 0) {
|
||||
Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicDkoDnce1, 61, -80, 2, -1, loop, 0);
|
||||
} else if (track == 1) {
|
||||
Music_Play(kMusicStrip1, 41, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicStrip1, 41, -80, 2, -1, loop, 0);
|
||||
} else if (track == 2) {
|
||||
Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
|
||||
Music_Play(kMusicArkDnce1, 41, -80, 2, -1, loop, 0);
|
||||
}
|
||||
++track;
|
||||
if (track > 2) {
|
||||
|
||||
@ -37,7 +37,7 @@ void SceneScriptNR11::InitializeScene() {
|
||||
Scene_Exit_Add_2D_Exit(0, 450, 305, 565, 345, 2);
|
||||
|
||||
if (!Game_Flag_Query(kFlagNR10CameraDestroyed)) {
|
||||
Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 22, 0, 1);
|
||||
Ambient_Sounds_Adjust_Looping_Sound(kSfx35MM, 22, 0, 1u);
|
||||
}
|
||||
|
||||
Ambient_Sounds_Add_Looping_Sound(kSfxCTDRONE1, 22, 0, 1);
|
||||
@ -181,7 +181,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(kMusicLoveSong, 35, 0, 3, -1, 0, 0);
|
||||
Music_Play(kMusicLoveSong, 35, 0, 3, -1, kMusicLoopPlayOnce, 0);
|
||||
}
|
||||
Loop_Actor_Walk_To_XYZ(kActorDektora, -135.0f, 0.33f, -267.0f, 0, false, false, false);
|
||||
Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
|
||||
@ -218,7 +218,7 @@ bool SceneScriptNR11::ClickedOn3DObject(const char *objectName, bool combatMode)
|
||||
Actor_Says(kActorDektora, 1080, 13);
|
||||
Actor_Says(kActorMcCoy, 3875, 14);
|
||||
Actor_Says(kActorDektora, 1090, 17);
|
||||
Music_Stop(4);
|
||||
Music_Stop(4u);
|
||||
Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11WalkAway);
|
||||
if (Global_Variable_Query(kVariableHollowayArrest) == 1) {
|
||||
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR10Wait);
|
||||
|
||||
@ -33,7 +33,7 @@ void SceneScriptTB02::InitializeScene() {
|
||||
Setup_Scene_Information(-32.0f, 0.0f, 1578.0f, 639);
|
||||
} else {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Outtake_Play(kOuttakeTyrellBuildingFly, false, -1); // TB_FLY_#.VQA Note: this is the only fly-through scene that is localized!
|
||||
Setup_Scene_Information(-304.0f, -81.46f, 1434.0f, 250);
|
||||
}
|
||||
@ -169,7 +169,7 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) {
|
||||
if (exitId == 0) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1774.0f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
Game_Flag_Set(kFlagTB02toTB03);
|
||||
Game_Flag_Reset(kFlagTB02ElevatorToTB05);
|
||||
Set_Enter(kSetTB02_TB03, kSceneTB03);
|
||||
@ -181,7 +181,7 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) {
|
||||
if (exitId == 1) {
|
||||
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -32.0f, 0.0f, 1578.0f, 0, true, false, false)) {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
if (Global_Variable_Query(kVariableChapter) < 4) {
|
||||
Game_Flag_Set(kFlagTB05Entered);
|
||||
Game_Flag_Set(kFlagTB02toTB05);
|
||||
@ -304,7 +304,7 @@ void SceneScriptTB02::PlayerWalkedIn() {
|
||||
if (Actor_Query_Goal_Number(kActorTyrellGuard) == kGoalTyrellGuardSleeping) {
|
||||
Actor_Set_Goal_Number(kActorTyrellGuard, kGoalTyrellGuardWakeUp);
|
||||
}
|
||||
Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
|
||||
Music_Play(kMusicBatl226M, 50, 0, 2, -1, kMusicLoopPlayOnce, 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, false);
|
||||
@ -385,7 +385,7 @@ void SceneScriptTB02::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptTB02::PlayerWalkedOut() {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
#if BLADERUNNER_ORIGINAL_BUGS
|
||||
#else
|
||||
if (Global_Variable_Query(kVariableChapter) < 4
|
||||
|
||||
@ -126,7 +126,7 @@ bool SceneScriptUG01::ClickedOn3DObject(const char *objectName, bool a2) {
|
||||
Scene_Loop_Set_Default(kUG01LoopMainLoopNoSteam);
|
||||
Scene_Loop_Start_Special(kSceneLoopModeOnce, kUG01LoopSteamDissapating, false);
|
||||
Sound_Play(kSfxSTEAM6A, 40, 0, 0, 50);
|
||||
Ambient_Sounds_Remove_Looping_Sound(kSfxSTMLOOP7, 2);
|
||||
Ambient_Sounds_Remove_Looping_Sound(kSfxSTMLOOP7, 2u);
|
||||
#endif // BLADERUNNER_ORIGINAL_BUGS
|
||||
Game_Flag_Set(kFlagUG01SteamOff);
|
||||
} else {
|
||||
@ -216,7 +216,7 @@ void SceneScriptUG01::PlayerWalkedIn() {
|
||||
}
|
||||
|
||||
if (Actor_Query_Goal_Number(kActorLucy) == kGoalLucyUG01Wait) {
|
||||
Music_Play(kMusicLoveSong, 35, 0, 3, -1, 0, 0);
|
||||
Music_Play(kMusicLoveSong, 35, 0, 3, -1, kMusicLoopPlayOnce, 0);
|
||||
Actor_Set_Goal_Number(kActorLucy, kGoalLucyUG01VoightKampff);
|
||||
}
|
||||
//return false;
|
||||
@ -224,7 +224,7 @@ void SceneScriptUG01::PlayerWalkedIn() {
|
||||
|
||||
void SceneScriptUG01::PlayerWalkedOut() {
|
||||
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1);
|
||||
Ambient_Sounds_Remove_All_Looping_Sounds(1u);
|
||||
#if BLADERUNNER_ORIGINAL_BUGS
|
||||
#else
|
||||
Screen_Effect_Restore_All(false);
|
||||
|
||||
@ -50,10 +50,10 @@ void EndCredits::show() {
|
||||
_vm->_mouse->disable();
|
||||
_vm->_mixer->stopAll();
|
||||
_vm->_ambientSounds->removeAllNonLoopingSounds(true);
|
||||
_vm->_ambientSounds->removeAllLoopingSounds(4);
|
||||
_vm->_ambientSounds->removeAllLoopingSounds(4u);
|
||||
_vm->_audioSpeech->stopSpeech();
|
||||
|
||||
_vm->_music->play(_vm->_gameInfo->getMusicTrack(kMusicCredits), 100, 0, 2, -1, 0, 3);
|
||||
_vm->_music->play(_vm->_gameInfo->getMusicTrack(kMusicCredits), 100, 0, 2, -1, kMusicLoopPlayOnce, 3);
|
||||
|
||||
Font *fontBig = Font::load(_vm, "TAHOMA24.FON", 1, true);
|
||||
Font *fontSmall = Font::load(_vm, "TAHOMA18.FON", 1, true);
|
||||
@ -157,7 +157,7 @@ void EndCredits::show() {
|
||||
delete fontSmall;
|
||||
delete fontBig;
|
||||
|
||||
_vm->_music->stop(0);
|
||||
_vm->_music->stop(0u);
|
||||
_vm->_mouse->enable();
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user