aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-04-30 21:00:48 -1000
committerPaul Gilbert2015-04-30 21:00:48 -1000
commit821040deaaa4dabf160795e96cb223ba192a87d3 (patch)
tree28b5f8d7a49bf5ada3761a6584cbfb62bdb7bba2
parentd811e4a9ff48426b01f199db8f24b00e679592d5 (diff)
downloadscummvm-rg350-821040deaaa4dabf160795e96cb223ba192a87d3.tar.gz
scummvm-rg350-821040deaaa4dabf160795e96cb223ba192a87d3.tar.bz2
scummvm-rg350-821040deaaa4dabf160795e96cb223ba192a87d3.zip
SHERLOCK: Fix blank talk windows sometimes remaining open
-rw-r--r--engines/sherlock/talk.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 2c59876e84..ed8092c03e 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1159,7 +1159,7 @@ void Talk::doScript(const Common::String &script) {
case PAUSE:
// Pause
- charCount = *++str;
+ charCount = (byte)*++str;
wait = pauseFlag = true;
break;
@@ -1598,8 +1598,8 @@ void Talk::doScript(const Common::String &script) {
++line;
// Certain different conditions require a wait
- if ((line == 4 && str[0] != SFX_COMMAND && str[0] != PAUSE && _speaker != -1) ||
- (line == 5 && str[0] != PAUSE && _speaker != -1) ||
+ if ((line == 4 && (byte)str[0] != SFX_COMMAND && (byte)str[0] != PAUSE && _speaker != -1) ||
+ (line == 5 && (byte)str[0] != PAUSE && _speaker != -1) ||
endStr) {
wait = 1;
}