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

[criezy]

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:
abb33e5362 DRASCULA: Fix slight delay when interrupting intro animation


Commit: abb33e53628ca4c639478911c734bf18af76be1d
    https://github.com/scummvm/scummvm/commit/abb33e53628ca4c639478911c734bf18af76be1d
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-07-20T20:18:40+01:00

Commit Message:
DRASCULA: Fix slight delay when interrupting intro animation

The delay occurred when trying to interrupt the animation while at
the start of the first scene with Igor. After the interruption (skipping
the intro, return to launcher or quitting ScummVM) it would continue
to play the animation for a bit longer than necessary.

Changed paths:
    engines/drascula/animation.cpp



diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index f672ad3..8b3299a 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -116,7 +116,7 @@ void DrasculaEngine::animation_1_1() {
 		if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE) || shouldQuit())
 			break;
 
-		for (int l2 = 0; l2 < 3; l2++)
+		for (int l2 = 0; l2 < 3; l2++) {
 			for (int l = 0; l < 7; l++) {
 				copyBackground();
 				copyBackground(interf_x[l], interf_y[l], 156, 45, 63, 31, drawSurface2, screenSurface);
@@ -129,6 +129,9 @@ void DrasculaEngine::animation_1_1() {
 			}
 			if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE) || shouldQuit())
 				break;
+		}
+		if ((term_int == 1) || (getScan() == Common::KEYCODE_ESCAPE) || shouldQuit())
+			break;
 
 		for (int l = 0, l2 = 0, p = 0; l < 180; l++) {
 			copyBackground(0, 0, 320 - l, 0, l, 200, drawSurface3, screenSurface);