aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2014-01-15 20:36:26 +0100
committeruruk2014-01-15 20:36:26 +0100
commitf2206381bc528a0e5a59fc0bf82efc7100a8fa7a (patch)
treee3dc8abd0ca9b485ca8cc7969afac55cc8cc7755
parentee0d3b609ff9d30f94ee506dd467fc0e38360bc8 (diff)
downloadscummvm-rg350-f2206381bc528a0e5a59fc0bf82efc7100a8fa7a.tar.gz
scummvm-rg350-f2206381bc528a0e5a59fc0bf82efc7100a8fa7a.tar.bz2
scummvm-rg350-f2206381bc528a0e5a59fc0bf82efc7100a8fa7a.zip
AVALANCHE: Fix another bug regarding speaking.
This prevents the player from giving commands to Avalot when the character is tied up to a tree, so it's impossible to break the game's consistency that way.
-rw-r--r--engines/avalanche/parser.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index 10a4de3394..b0524a0d7e 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -1694,6 +1694,11 @@ void Parser::doThat() {
// "Slip" object
_thing -= 49;
+ if (_vm->_tiedUp) {
+ _vm->_dialogs->displayText("You better stay quiet now!");
+ return;
+ }
+
if ((_verb != kVerbCodeLoad) && (_verb != kVerbCodeSave) && (_verb != kVerbCodeQuit) && (_verb != kVerbCodeInfo) && (_verb != kVerbCodeHelp)
&& (_verb != kVerbCodeLarrypass) && (_verb != kVerbCodePhaon) && (_verb != kVerbCodeBoss) && (_verb != kVerbCodeCheat) && (_verb != kVerbCodeRestart)
&& (_verb != kVerbCodeDir) && (_verb != kVerbCodeScore) && (_verb != kVerbCodeHiscores) && (_verb != kVerbCodeSmartAlec)) {