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

[bluegr]

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:
bdd131450f QUEEN: Fix bug #3612408 - "QUEEN: Can't quit from ScummVM while ending cutscene"


Commit: bdd131450f415c4871452078f876baa5f8baeea5
    https://github.com/scummvm/scummvm/commit/bdd131450f415c4871452078f876baa5f8baeea5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-05-11T07:20:57-07:00

Commit Message:
QUEEN: Fix bug #3612408 - "QUEEN: Can't quit from ScummVM while ending cutscene"

We now check if the engine should quit in the loop of the end credits animation

Changed paths:
    engines/queen/logic.cpp



diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp
index 339942e..ea13e59 100644
--- a/engines/queen/logic.cpp
+++ b/engines/queen/logic.cpp
@@ -1798,7 +1798,7 @@ void Logic::asmScaleBlimp() {
 	int16 x = bob->x;
 	int16 y = bob->y;
 	bob->scale = 100;
-	while (bob->x > 150) {
+	while (bob->x > 150 && !_vm->shouldQuit()) {
 		bob->x = x * 256 / z + 150;
 		bob->y = y * 256 / z + 112;
 		if (_vm->resource()->getPlatform() != Common::kPlatformAmiga) {