[Scummvm-git-logs] scummvm master -> 2d4dffdac0dc251d252bbc1ec6205546b9ac44b9

[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:
2d4dffdac0 BLADERUNNER: Stop McCoy from buying absinthe a second time


Commit: 2d4dffdac0dc251d252bbc1ec6205546b9ac44b9
    https://github.com/scummvm/scummvm/commit/2d4dffdac0dc251d252bbc1ec6205546b9ac44b9
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-06-26T18:26:40+03:00

Commit Message:
BLADERUNNER: Stop McCoy from buying absinthe a second time

After he gives it to transient, he should not be able to buy it again

That's because the Flask option is added to be selected only once, so McCoy won't be able to give it again to the homeless guy to get more info, and also the second time round, he gets the exact same dialogue from the bartender at the Hawker's Circle, which does not sound right.

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


diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp
index b4cbc81..41fd7c7 100644
--- a/engines/bladerunner/script/scene/hc02.cpp
+++ b/engines/bladerunner/script/scene/hc02.cpp
@@ -111,11 +111,14 @@ bool SceneScriptHC02::ClickedOnActor(int actorId) {
 				Actor_Says(kActorHawkersBarkeep, 180, 13);
 				Actor_Clue_Acquire(kActorMcCoy, kClueChinaBarSecurityDisc, true, kActorHawkersBarkeep);
 				Item_Pickup_Spin_Effect(kModelAnimationVideoDisc, 229, 215);
-			} else if ( Actor_Clue_Query(kActorMcCoy, kClueHomelessManInterview1)
-			        && !Actor_Clue_Query(kActorMcCoy, kClueFlaskOfAbsinthe)
-			        &&  (Global_Variable_Query(kVariableChinyen) > 20
-			         ||  Query_Difficulty_Level() == kGameDifficultyEasy
-			        )
+			} else if (Actor_Clue_Query(kActorMcCoy, kClueHomelessManInterview1)
+			           && !Actor_Clue_Query(kActorMcCoy, kClueFlaskOfAbsinthe)
+#if !BLADERUNNER_ORIGINAL_BUGS
+			           // don't re-get the flask if McCoy already gave it to the transient (he loses the kClueFlaskOfAbsinthe clue when he does)
+			           && !Actor_Clue_Query(kActorTransient, kClueFlaskOfAbsinthe)
+#endif // !BLADERUNNER_ORIGINAL_BUGS
+			           && (Global_Variable_Query(kVariableChinyen) > 20
+			               || Query_Difficulty_Level() == kGameDifficultyEasy)
 			) {
 				Actor_Clue_Acquire(kActorMcCoy, kClueFlaskOfAbsinthe, true, kActorHawkersBarkeep);
 				Actor_Says(kActorMcCoy, 1230, 13);