From 2c68c1a06cbf5389ffd01f115fdf9b479159e7c7 Mon Sep 17 00:00:00 2001 From: Thanasis Antoniou Date: Fri, 2 Aug 2019 14:55:45 +0300 Subject: BLADERUNNER: Restore nu-sooch dumped comment --- engines/bladerunner/game_constants.h | 2 +- engines/bladerunner/script/ai/zuben.cpp | 2 +- engines/bladerunner/script/scene/ct02.cpp | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h index e41ed4faae..0e22648453 100644 --- a/engines/bladerunner/game_constants.h +++ b/engines/bladerunner/game_constants.h @@ -1160,7 +1160,7 @@ enum Flags { kflagPS01toPS02 = 718, kFlagCT02McCoyFell = 719, kFlagCT02McCoyCombatReady = 720, - kFlagNotUsed721 = 721, + kFlagCT02McCoyShouldCommentOnDumpedSoup = 721, // Now: used for cut content for McCoy's monologue if he fails to dodge the soup, Original: was set but not used kFlagChapter4Starting = 722, kFlagZubenBountyPaid = 723, kFlagUG15BridgeBreaks = 724, diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp index 8fbcb77a35..38f7f3e01c 100644 --- a/engines/bladerunner/script/ai/zuben.cpp +++ b/engines/bladerunner/script/ai/zuben.cpp @@ -161,7 +161,7 @@ void AIScriptZuben::CompletedMovementTrack() { AI_Countdown_Timer_Reset(kActorZuben, kActorTimerAIScriptCustomTask0); Game_Flag_Reset(kFlagCT02McCoyFell); Game_Flag_Set(kFlagCT02McCoyCombatReady); - Game_Flag_Set(kFlagNotUsed721); + Game_Flag_Set(kFlagCT02McCoyShouldCommentOnDumpedSoup); Music_Stop(2); Actor_Set_Goal_Number(kActorZuben, kGoalZubenFled); Set_Enter(kSetCT02, kSceneCT02); diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp index 4657e3a647..f143e989de 100644 --- a/engines/bladerunner/script/scene/ct02.cpp +++ b/engines/bladerunner/script/scene/ct02.cpp @@ -44,6 +44,14 @@ void SceneScriptCT02::InitializeScene() { } else { Setup_Scene_Information(-119.02f, -145.11f, 240.99f, 768); } + if (_vm->_cutContent + && Global_Variable_Query(kVariableChapter) == 1 + && Game_Flag_Query(kFlagCT02McCoyShouldCommentOnDumpedSoup) + ) { + Scene_2D_Region_Add(0, 115, 350, 430, 420);// dumped soup + Scene_2D_Region_Add(1, 180, 235, 255, 315);// use a region for the pot too (there's an object but it's better to have a region) + } + Scene_Exit_Add_2D_Exit(kCT02ExitCT01, 590, 0, 639, 479, 1); if (Actor_Clue_Query(kActorMcCoy, kClueZubenRunsAway)) { Scene_Exit_Add_2D_Exit(kCT02ExitCT03, 332, 163, 404, 297, 0); @@ -279,6 +287,16 @@ bool SceneScriptCT02::ClickedOnExit(int exitId) { } bool SceneScriptCT02::ClickedOn2DRegion(int region) { + if (_vm->_cutContent + && Game_Flag_Query(kFlagCT02McCoyShouldCommentOnDumpedSoup) + && (region == 0 || region == 1) + ) { + Game_Flag_Reset(kFlagCT02McCoyShouldCommentOnDumpedSoup); + Scene_2D_Region_Remove(0); + Scene_2D_Region_Remove(1); + Actor_Voice_Over(4270, kActorVoiceOver); + return true; + } return false; } -- cgit v1.2.3