aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThanasis Antoniou2019-06-26 18:26:40 +0300
committerThanasis Antoniou2019-06-26 18:26:40 +0300
commit2d4dffdac0dc251d252bbc1ec6205546b9ac44b9 (patch)
tree53dd25df3e7cb5f6ebeddced22e39e62336e45db
parent8f74f0f47ea3f1d956b5a21124d13d9a9a113241 (diff)
downloadscummvm-rg350-2d4dffdac0dc251d252bbc1ec6205546b9ac44b9.tar.gz
scummvm-rg350-2d4dffdac0dc251d252bbc1ec6205546b9ac44b9.tar.bz2
scummvm-rg350-2d4dffdac0dc251d252bbc1ec6205546b9ac44b9.zip
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.
-rw-r--r--engines/bladerunner/script/scene/hc02.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp
index b4cbc818c3..41fd7c7d12 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);