diff options
author | Peter Kohaut | 2019-01-14 21:09:12 +0100 |
---|---|---|
committer | Peter Kohaut | 2019-01-15 08:35:46 +0100 |
commit | adf741a5cb9ea8ffcaa2cde141cb4250c1f7f0a5 (patch) | |
tree | 237f9a28b915c6d0f91ba9baf6fd5b82c5229247 /engines/bladerunner/script/scene/ct06.cpp | |
parent | 2eb6bba7bd5240f0e97a03f55da96967ef2ac4f1 (diff) | |
download | scummvm-rg350-adf741a5cb9ea8ffcaa2cde141cb4250c1f7f0a5.tar.gz scummvm-rg350-adf741a5cb9ea8ffcaa2cde141cb4250c1f7f0a5.tar.bz2 scummvm-rg350-adf741a5cb9ea8ffcaa2cde141cb4250c1f7f0a5.zip |
BLADERUNNER: More variable names in the game scripts
Diffstat (limited to 'engines/bladerunner/script/scene/ct06.cpp')
-rw-r--r-- | engines/bladerunner/script/scene/ct06.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp index 5a8f0a6d12..dd78e208f6 100644 --- a/engines/bladerunner/script/scene/ct06.cpp +++ b/engines/bladerunner/script/scene/ct06.cpp @@ -35,7 +35,7 @@ void SceneScriptCT06::InitializeScene() { } Scene_Exit_Add_2D_Exit(0, 0, 440, 639, 479, 2); Scene_Exit_Add_2D_Exit(1, 401, 162, 536, 317, 0); - if (Game_Flag_Query(kFlagZubenRetired) && Actor_Query_In_Set(kActorZuben, 30)) { + if (Game_Flag_Query(kFlagZubenRetired) && Actor_Query_In_Set(kActorZuben, kSetCT07)) { Actor_Put_In_Set(kActorZuben, kSetCT06); Actor_Set_At_XYZ(kActorZuben, 58.41f, -58.23f, -24.97f, 240); Actor_Retired_Here(kActorZuben, 72, 36, 1, kActorMcCoy); @@ -88,25 +88,25 @@ bool SceneScriptCT06::ClickedOn3DObject(const char *objectName, bool a2) { bool SceneScriptCT06::ClickedOnActor(int actorId) { if (actorId == kActorZuben) { - Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorZuben, 24, 1, false); + Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorZuben, 24, true, false); Actor_Face_Actor(kActorMcCoy, kActorZuben, true); - if (Game_Flag_Query(145)) { - Actor_Says(kActorMcCoy, 8570, 13); - return false; - } - Actor_Clue_Acquire(kActorMcCoy, kClueZuben, 1, -1); - Item_Pickup_Spin_Effect(984, 340, 369); - Actor_Voice_Over(350, kActorVoiceOver); - Actor_Voice_Over(360, kActorVoiceOver); - Actor_Voice_Over(370, kActorVoiceOver); - if (!Game_Flag_Query(kFlagDirectorsCut)) { - Actor_Voice_Over(380, kActorVoiceOver); - Actor_Voice_Over(390, kActorVoiceOver); - Actor_Voice_Over(400, kActorVoiceOver); - Actor_Voice_Over(410, kActorVoiceOver); + if (!Game_Flag_Query(kFlagZubenPhoto)) { + Actor_Clue_Acquire(kActorMcCoy, kClueZuben, 1, -1); + Item_Pickup_Spin_Effect(984, 340, 369); + Actor_Voice_Over(350, kActorVoiceOver); + Actor_Voice_Over(360, kActorVoiceOver); + Actor_Voice_Over(370, kActorVoiceOver); + if (!Game_Flag_Query(kFlagDirectorsCut)) { + Actor_Voice_Over(380, kActorVoiceOver); + Actor_Voice_Over(390, kActorVoiceOver); + Actor_Voice_Over(400, kActorVoiceOver); + Actor_Voice_Over(410, kActorVoiceOver); + } + Game_Flag_Set(kFlagZubenPhoto); + return true; } - Game_Flag_Set(145); - return true; + Actor_Says(kActorMcCoy, 8570, 13); + return false; } return false; } @@ -122,7 +122,7 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagCT06toCT05); Set_Enter(kSetCT05, kSceneCT05); - Game_Flag_Reset(212); + Game_Flag_Reset(kFlagNotUsed212); } return true; } @@ -135,7 +135,7 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_Sound(199, true); Player_Loses_Control(); Actor_Set_Goal_Number(kActorZuben, kGoalZubenCT06JumpDown); - Game_Flag_Reset(212); + Game_Flag_Reset(kFlagNotUsed212); } return true; } @@ -148,7 +148,7 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagCT06toCT08); Set_Enter(kSetCT08_CT51_UG12, kSceneCT08); - Game_Flag_Reset(212); + Game_Flag_Reset(kFlagNotUsed212); } } } |