[Scummvm-git-logs] scummvm master -> 2c68c1a06cbf5389ffd01f115fdf9b479159e7c7
antoniou79
antoniou at cti.gr
Fri Aug 2 13:57:34 CEST 2019
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2c68c1a06c BLADERUNNER: Restore nu-sooch dumped comment
Commit: 2c68c1a06cbf5389ffd01f115fdf9b479159e7c7
https://github.com/scummvm/scummvm/commit/2c68c1a06cbf5389ffd01f115fdf9b479159e7c7
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-08-02T14:56:07+03:00
Commit Message:
BLADERUNNER: Restore nu-sooch dumped comment
Changed paths:
engines/bladerunner/game_constants.h
engines/bladerunner/script/ai/zuben.cpp
engines/bladerunner/script/scene/ct02.cpp
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index e41ed4f..0e22648 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 8fbcb77..38f7f3e 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 4657e3a..f143e98 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;
}
More information about the Scummvm-git-logs
mailing list