diff options
Diffstat (limited to 'engines/bladerunner/script/scene')
| -rw-r--r-- | engines/bladerunner/script/scene/ct01.cpp | 10 | ||||
| -rw-r--r-- | engines/bladerunner/script/scene/ct02.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp index e0af940627..5a308099ca 100644 --- a/engines/bladerunner/script/scene/ct01.cpp +++ b/engines/bladerunner/script/scene/ct01.cpp @@ -125,7 +125,7 @@ bool SceneScriptCT01::ClickedOnActor(int actorId) { Game_Flag_Set(26); Actor_Set_Goal_Number(kActorHowieLee, 0); } else if (!Game_Flag_Query(30) && Actor_Query_Friendliness_To_Other(kActorHowieLee, kActorMcCoy) >= 40) { - sub_40269C(); + dialogueWithHowieLee(); Actor_Set_Goal_Number(kActorHowieLee, 0); } else { if (Game_Flag_Query(31)) { @@ -395,7 +395,7 @@ void SceneScriptCT01::PlayerWalkedIn() { } void SceneScriptCT01::PlayerWalkedOut() { - Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); + Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); if (Game_Flag_Query(123)) { Ambient_Sounds_Remove_Looping_Sound(55, true); Ambient_Sounds_Remove_Looping_Sound(56, true); @@ -403,8 +403,8 @@ void SceneScriptCT01::PlayerWalkedOut() { Ambient_Sounds_Remove_All_Looping_Sounds(1); } Music_Stop(5); - if (!Game_Flag_Query(176) && Global_Variable_Query(kVariableChapter)) { - Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); + if (!Game_Flag_Query(176) && Global_Variable_Query(kVariableChapter) == 1) { + Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Outtake_Play(kOuttakeTowards3, true, -1); } @@ -413,7 +413,7 @@ void SceneScriptCT01::PlayerWalkedOut() { void SceneScriptCT01::DialogueQueueFlushed(int a1) { } -void SceneScriptCT01::sub_40269C() { +void SceneScriptCT01::dialogueWithHowieLee() { Dialogue_Menu_Clear_List(); if (Actor_Clue_Query(kActorMcCoy, kClueLucy)) { DM_Add_To_List_Never_Repeat_Once_Selected(40, 4, 5, 6); diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp index 499ad13695..ca17d784a4 100644 --- a/engines/bladerunner/script/scene/ct02.cpp +++ b/engines/bladerunner/script/scene/ct02.cpp @@ -105,7 +105,7 @@ bool SceneScriptCT02::ClickedOn3DObject(const char *objectName, bool a2) { return false; } -void SceneScriptCT02::sub_401ACC() { +void SceneScriptCT02::dialogueWithZuben() { Dialogue_Menu_Clear_List(); if (Actor_Clue_Query(kActorMcCoy, kClueLucy)) { DM_Add_To_List_Never_Repeat_Once_Selected(270, 8, 5, 3); @@ -209,7 +209,7 @@ bool SceneScriptCT02::ClickedOnActor(int actorId) { Actor_Says(kActorMcCoy, 375, 9); Game_Flag_Set(59); } - sub_401ACC(); + dialogueWithZuben(); return true; } } |