diff options
Diffstat (limited to 'engines/bladerunner/script/scene/ps04.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/ps04.cpp | 50 |
1 files changed, 47 insertions, 3 deletions
diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp index 6be812804c..a5b2f01060 100644 --- a/engines/bladerunner/script/scene/ps04.cpp +++ b/engines/bladerunner/script/scene/ps04.cpp @@ -24,6 +24,11 @@ namespace BladeRunner { +enum kPS04Loops { + kPS04LoopPanToPS04 = 0, // 0 - 29 + kPS04LoopMainLoop = 1, // 30 - 90 (actually 31-90) +}; + void SceneScriptPS04::InitializeScene() { AI_Movement_Track_Pause(kActorGuzza); if (Game_Flag_Query(kFlagPS03toPS04)) { @@ -46,8 +51,8 @@ void SceneScriptPS04::InitializeScene() { Ambient_Sounds_Add_Sound(kSfxSCANNER5, 9, 40, 20, 20, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(kSfxSCANNER6, 9, 40, 20, 20, 0, 0, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(kSfxSCANNER7, 9, 40, 20, 20, 0, 0, -101, -101, 0, 0); - Scene_Loop_Start_Special(0, 0, 0); - Scene_Loop_Set_Default(1); + Scene_Loop_Start_Special(kPS04LoopPanToPS04, 0, 0); + Scene_Loop_Set_Default(kPS04LoopMainLoop); } void SceneScriptPS04::SceneLoaded() { @@ -126,13 +131,47 @@ bool SceneScriptPS04::ClickedOn2DRegion(int region) { } void SceneScriptPS04::SceneFrameAdvanced(int frame) { + if (_vm->_cutContent) { + // custom code added for fading out and back in when Guzza calls in favors + // TODO keep this? + Set_Fade_Color(0, 0, 0); + if (frame > 5 && frame < 30) { + // transition scene + if ( Actor_Query_Goal_Number(kActorGuzza) == kGoalGuzzaCalledFavorsForHobo) { + Set_Fade_Density(0.0f); + if (Global_Variable_Query(kVariableChapter) == 1) { + Actor_Set_Goal_Number(kActorGuzza, kGoalGuzzaDefault); + } else if (Global_Variable_Query(kVariableChapter) < 4) { + Actor_Set_Goal_Number(kActorGuzza, kGoalGuzzaAtOffice); + } + } + } + else if (frame >= 79 && frame < 90) { + if ( frame == 79 && Actor_Query_Goal_Number(kActorGuzza) == kGoalGuzzaCallFavorsForHoboShoot1) { + Actor_Set_Goal_Number(kActorGuzza, kGoalGuzzaCallFavorsForHoboShoot2); + } + if ( Actor_Query_Goal_Number(kActorGuzza) == kGoalGuzzaCallFavorsForHoboShoot2) { + // Fading out + Set_Fade_Density((frame - 79) / 10.0f); + } + } else if (frame == 90) { + if ( Actor_Query_Goal_Number(kActorGuzza) == kGoalGuzzaCallFavorsForHoboShoot2) { + // Faded out + Set_Fade_Density(1.0f); + Scene_Loop_Start_Special(kPS04LoopPanToPS04, 0, 0); + Scene_Loop_Set_Default(kPS04LoopMainLoop); + Actor_Set_Goal_Number(kActorGuzza, kGoalGuzzaCalledFavorsForHobo); + } + } + // end of: custom code added for fading out and back in when Guzza calls in favors + } } void SceneScriptPS04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bool currentSet) { } void SceneScriptPS04::PlayerWalkedIn() { - if (Actor_Query_Which_Set_In(kActorGuzza) == 64) { + if (Actor_Query_Which_Set_In(kActorGuzza) == kSetPS04) { Actor_Face_Actor(kActorMcCoy, kActorGuzza, true); } //return false; @@ -351,6 +390,11 @@ void SceneScriptPS04::dialogueWithGuzza() { Actor_Says(kActorGuzza, 610, 33); Actor_Face_Heading(kActorGuzza, 400, false); Actor_Says(kActorGuzza, 620, 32); + if (_vm->_cutContent) { + // add a fade-out here while Guzza calls-in for favors + Actor_Set_Goal_Number(kActorGuzza, kGoalGuzzaCallFavorsForHoboShoot1); + Delay(4000); + } Actor_Face_Actor(kActorGuzza, kActorMcCoy, true); Actor_Says(kActorGuzza, 700, 34); Actor_Says(kActorMcCoy, 4100, 13); |