aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2016-09-21 21:50:23 +0200
committerEugene Sandulenko2016-09-21 21:59:35 +0200
commitdd4f58e9d4042a98dc9ad1263f3c571714e86f36 (patch)
treea604002f23965202d058e6ecf97e368d6d72c5cc
parent97d444a569ac13023acebffa62f2d87e8b1e0eab (diff)
downloadscummvm-rg350-dd4f58e9d4042a98dc9ad1263f3c571714e86f36.tar.gz
scummvm-rg350-dd4f58e9d4042a98dc9ad1263f3c571714e86f36.tar.bz2
scummvm-rg350-dd4f58e9d4042a98dc9ad1263f3c571714e86f36.zip
FULLPIPE: Fix errorneous message queue cleanup
-rw-r--r--engines/fullpipe/messages.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index 68ceae353b..a9fc5210a3 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -502,6 +502,9 @@ bool MessageQueue::checkGlobalExCommandList1() {
if (ex1->_messageKind != 1 && ex1->_messageKind != 20 && ex1->_messageKind != 5 && ex1->_messageKind != 27)
continue;
+ if (ex1->_parentId != ex->_parentId)
+ continue;
+
if (ex1->_param != ex->_param && ex1->_param != -1 && ex->_param != -1)
continue;
@@ -533,6 +536,11 @@ bool MessageQueue::checkGlobalExCommandList2() {
continue;
}
+ if (ex1->_parentId != ex->_parentId) {
+ it++;
+ continue;
+ }
+
if (ex1->_param != ex->_param && ex1->_param != -1 && ex->_param != -1) {
it++;
continue;