aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/script
diff options
context:
space:
mode:
authorThanasis Antoniou2019-05-15 22:52:00 +0300
committerThanasis Antoniou2019-05-15 22:53:45 +0300
commit297ebb73e0e922c635397086cdca46cd8d00c74b (patch)
tree9e1ecf9b6c66085cb4cf8fc7c4ba55061035ebee /engines/bladerunner/script
parent2d992a44309cfbe033d6a02c32db4183bf7ac978 (diff)
downloadscummvm-rg350-297ebb73e0e922c635397086cdca46cd8d00c74b.tar.gz
scummvm-rg350-297ebb73e0e922c635397086cdca46cd8d00c74b.tar.bz2
scummvm-rg350-297ebb73e0e922c635397086cdca46cd8d00c74b.zip
BLADERUNNER: Warning if loading restored cut content save in original mode
And vice versa. The game won't exit, it will continue loading but adjust the mode accordingly Also added a incremental version number for the save games (as a global variable), for possible future use
Diffstat (limited to 'engines/bladerunner/script')
-rw-r--r--engines/bladerunner/script/init_script.cpp5
-rw-r--r--engines/bladerunner/script/scene/ct02.cpp3
-rw-r--r--engines/bladerunner/script/scene/ma04.cpp4
3 files changed, 8 insertions, 4 deletions
diff --git a/engines/bladerunner/script/init_script.cpp b/engines/bladerunner/script/init_script.cpp
index e60dbbfe67..aa16a3b83e 100644
--- a/engines/bladerunner/script/init_script.cpp
+++ b/engines/bladerunner/script/init_script.cpp
@@ -61,6 +61,7 @@ void InitScript::Init_Globals() {
Global_Variable_Set(kVariableGenericWalkerConfig, 2);
Global_Variable_Set(kVariableChapter, 1);
Global_Variable_Set(kVariableChinyen, 100);
+ Global_Variable_Set(kVariableGameVersion, _vm->kBladeRunnerScummVMVersion);
Set_Score(0, 0);
Set_Score(1, 64);
@@ -125,6 +126,10 @@ void InitScript::Init_Game_Flags() {
Game_Flag_Set(kFlagMcCoyInRunciters);
Game_Flag_Set(kFlagSpinnerAtRC01);
+
+ if (_vm->_cutContent) {
+ Game_Flag_Set(kFlagGamePlayedInRestoredContentMode);
+ }
}
void InitScript::Init_Clues() {
diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp
index aef8e45c56..4657e3a647 100644
--- a/engines/bladerunner/script/scene/ct02.cpp
+++ b/engines/bladerunner/script/scene/ct02.cpp
@@ -219,6 +219,9 @@ void SceneScriptCT02::dialogueWithZuben() {
Actor_Clue_Acquire(kActorMcCoy, kClueZubenRunsAway, true, -1);
Actor_Set_Goal_Number(kActorZuben, kGoalZubenCT02PushPot);
Game_Flag_Set(kFlagCT02PotTipped);
+ if (_vm->_cutContent) {
+ Game_Flag_Set(kFlagCT01TalkToHowieAfterZubenMissing);
+ }
Scene_Loop_Set_Default(kCT02LoopMainPotTipped);
Scene_Loop_Start_Special(kSceneLoopModeOnce, kCT02LoopTippingPot, true);
}
diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp
index 9bf36a6ed8..b196972457 100644
--- a/engines/bladerunner/script/scene/ma04.cpp
+++ b/engines/bladerunner/script/scene/ma04.cpp
@@ -312,10 +312,6 @@ void SceneScriptMA04::PlayerWalkedIn() {
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 955.0f, 1675.0f, 0, true, false, false);
Game_Flag_Set(kFlagChapter1Ending);
- if (_vm->_cutContent) {
- Game_Flag_Set(kFlagCT01TalkToHowieAfterZubenMissing);
- }
-
Async_Actor_Walk_To_XYZ(kActorMcCoy, -7204.0f, 956.17f, 1568.0f, 0, false);
Set_Enter(kSetMA05, kSceneMA05);
}