[Scummvm-git-logs] scummvm master -> 3002bc41387229061bdc2c9213a97eb9c1384549

[antoniou79]

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:
3002bc4138 BLADERUNNER: Addon fix for awry saved games for Clovis


Commit: 3002bc41387229061bdc2c9213a97eb9c1384549
    https://github.com/scummvm/scummvm/commit/3002bc41387229061bdc2c9213a97eb9c1384549
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-07-11T07:52:23+03:00

Commit Message:
BLADERUNNER: Addon fix for awry saved games for Clovis

This is for awry Clovis goal kGoalClovisKP07Wait (513)

Changed paths:
    engines/bladerunner/script/scene/kp07.cpp


diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp
index 4d3ed45..0643428 100644
--- a/engines/bladerunner/script/scene/kp07.cpp
+++ b/engines/bladerunner/script/scene/kp07.cpp
@@ -80,6 +80,23 @@ void SceneScriptKP07::InitializeScene() {
 			Actor_Set_At_XYZ(kActorLuther, -47.0f, 0.0f, 151.0f, 531);
 		}
 	}
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+	// Additional fix for saves with bad state (goal 513) for Clovis
+	// which resulted in him standing, clipping through his moonbus bed
+	// when McCoy is not helping the Replicants
+	else {
+		// McCoy is not helping the Replicants
+		if (Actor_Query_Goal_Number(kActorClovis) == kGoalClovisKP07Wait
+			&& !Game_Flag_Query(kFlagClovisLyingDown)) {
+			// this goal set is only for the purpose of switch Clovis goal out of kGoalClovisKP07Wait
+			Actor_Set_Goal_Number(kActorClovis, kGoalClovisStartChapter5);
+			// And explicitly switching back to kGoalClovisKP07Wait in order
+			// to trigger the bug-fixed GoalChanged() case in his AI
+			Actor_Set_Goal_Number(kActorClovis, kGoalClovisKP07Wait);
+		}
+	}
+#endif // BLADERUNNER_ORIGINAL_BUGS
 
 	Ambient_Sounds_Add_Looping_Sound(kSfxCOMPBED1,  7, 1, 1);
 	Ambient_Sounds_Add_Looping_Sound(kSfxMOONBED2, 52, 1, 1);