[Scummvm-cvs-logs] scummvm master -> f2206381bc528a0e5a59fc0bf82efc7100a8fa7a

[urukgit]

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:
f2206381bc AVALANCHE: Fix another bug regarding speaking.


Commit: f2206381bc528a0e5a59fc0bf82efc7100a8fa7a
    https://github.com/scummvm/scummvm/commit/f2206381bc528a0e5a59fc0bf82efc7100a8fa7a
Author: uruk (koppirnyo at gmail.com)
Date: 2014-01-15T11:36:26-08:00

Commit Message:
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.

Changed paths:
    engines/avalanche/parser.cpp



diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index 10a4de3..b0524a0 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)) {