[Scummvm-cvs-logs] scummvm master -> 2a70d2facbb3373ad4eb1bcb70aec1c7f5ac71ed

dreammaster dreammaster at scummvm.org
Fri Oct 16 14:23:51 CEST 2015


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:
2a70d2facb SHERLOCK: RT: Fix crash closing text dialogs with the keyboard


Commit: 2a70d2facbb3373ad4eb1bcb70aec1c7f5ac71ed
    https://github.com/scummvm/scummvm/commit/2a70d2facbb3373ad4eb1bcb70aec1c7f5ac71ed
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-16T08:23:19-04:00

Commit Message:
SHERLOCK: RT: Fix crash closing text dialogs with the keyboard

Changed paths:
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index f324f19..e9c5227 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1196,7 +1196,7 @@ void Talk::talkWait(const byte *&str) {
 		_endStr = true;
 
 	// If a key was pressed to finish the window, see if further voice files should be skipped
-	if (_wait >= 0 && _wait < 254) {
+	if (IS_SERRATED_SCALPEL && _wait >= 0 && _wait < 254) {
 		if (str[0] == _opcodes[OP_SFX_COMMAND])
 			str += 9;
 	}






More information about the Scummvm-git-logs mailing list