diff options
| author | Peter Kohaut | 2019-01-26 14:59:16 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2019-01-26 14:59:16 +0100 |
| commit | 3653703a40583bc538a2d8d4f55e37fff7bd42ab (patch) | |
| tree | dac8e28729c9862f13e822fc39a7a60168715450 /engines/bladerunner/script/scene/ct10.cpp | |
| parent | 71c262f88183720a0710a7627b4db324e8d3f66c (diff) | |
| download | scummvm-rg350-3653703a40583bc538a2d8d4f55e37fff7bd42ab.tar.gz scummvm-rg350-3653703a40583bc538a2d8d4f55e37fff7bd42ab.tar.bz2 scummvm-rg350-3653703a40583bc538a2d8d4f55e37fff7bd42ab.zip | |
BLADERUNNER: Analysed all Yukon hotel scenes
Diffstat (limited to 'engines/bladerunner/script/scene/ct10.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/ct10.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/engines/bladerunner/script/scene/ct10.cpp b/engines/bladerunner/script/scene/ct10.cpp index 0bbc6c2f50..3052fac9e8 100644 --- a/engines/bladerunner/script/scene/ct10.cpp +++ b/engines/bladerunner/script/scene/ct10.cpp @@ -64,8 +64,8 @@ bool SceneScriptCT10::MouseClick(int x, int y) { return false; } -void SceneScriptCT10::sub_401844() { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 10.6f, 0.0f, -50.5f, 0, 1, false, 0)) { +void SceneScriptCT10::checkCabinet() { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 10.6f, 0.0f, -50.5f, 0, true, false, 0)) { Player_Loses_Control(); Actor_Face_Heading(kActorMcCoy, 0, false); Sound_Play(339, 100, 0, 0, 50); @@ -82,7 +82,7 @@ void SceneScriptCT10::sub_401844() { bool SceneScriptCT10::ClickedOn3DObject(const char *objectName, bool a2) { if (Object_Query_Click("TUB", objectName)) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -41.0f, 0.0f, -106.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -41.0f, 0.0f, -106.0f, 0, true, false, 0)) { Player_Loses_Control(); Actor_Face_Heading(kActorMcCoy, 850, false); Actor_Change_Animation_Mode(kActorMcCoy, 38); @@ -101,8 +101,11 @@ bool SceneScriptCT10::ClickedOn3DObject(const char *objectName, bool a2) { } return true; } - if (Object_Query_Click("CABINETTOP", objectName) || Object_Query_Click("CABINETFRONT", objectName)) { - sub_401844(); + + if (Object_Query_Click("CABINETTOP", objectName) + || Object_Query_Click("CABINETFRONT", objectName) + ) { + checkCabinet(); return true; } return false; @@ -118,8 +121,8 @@ bool SceneScriptCT10::ClickedOnItem(int itemId, bool a2) { bool SceneScriptCT10::ClickedOnExit(int exitId) { if (exitId == 0) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -93.0f, 0.0f, -38.0f, 0, 1, false, 0)) { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -121.0f, 0.0f, -78.0f, 0, 0, false, 0); + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -93.0f, 0.0f, -38.0f, 0, true, false, 0)) { + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -121.0f, 0.0f, -78.0f, 0, false, false, 0); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagCT10toCT09); @@ -131,7 +134,7 @@ bool SceneScriptCT10::ClickedOnExit(int exitId) { bool SceneScriptCT10::ClickedOn2DRegion(int region) { if (region == 0) { - sub_401844(); + checkCabinet(); } return false; } @@ -145,11 +148,11 @@ void SceneScriptCT10::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo void SceneScriptCT10::PlayerWalkedIn() { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -93.0f, 0.0f, -38.0f, 0, 0, false, 0); Loop_Actor_Walk_To_XYZ(kActorMcCoy, -49.0f, 0.0f, -38.0f, 0, 0, false, 0); - if (!Game_Flag_Query(525)) { + if (!Game_Flag_Query(kFlagCT10Entered)) { Actor_Voice_Over(450, kActorVoiceOver); Actor_Voice_Over(460, kActorVoiceOver); Actor_Voice_Over(470, kActorVoiceOver); - Game_Flag_Set(525); + Game_Flag_Set(kFlagCT10Entered); } } |