[Scummvm-cvs-logs] scummvm master -> 28a8360896aa064917eabaaf0af8615c532de279

dreammaster dreammaster at scummvm.org
Sat Oct 17 04:37:37 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:
28a8360896 SHERLOCK: Don't clear events after a non-interruptable delay


Commit: 28a8360896aa064917eabaaf0af8615c532de279
    https://github.com/scummvm/scummvm/commit/28a8360896aa064917eabaaf0af8615c532de279
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-16T22:37:01-04:00

Commit Message:
SHERLOCK: Don't clear events after a non-interruptable delay

Changed paths:
    engines/sherlock/events.cpp



diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 1cd6a06..4b0b7df 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -350,7 +350,8 @@ bool Events::delay(uint32 time, bool interruptable) {
 		g_system->delayMillis(time);
 		bool result = !(interruptable && (kbHit() || _pressed || _vm->shouldQuit()));
 
-		clearEvents();
+		if (interruptable)
+			clearEvents();
 		return result;
 	} else {
 		// For long periods go into a loop where we delay by 10ms at a time and then






More information about the Scummvm-git-logs mailing list