[Scummvm-cvs-logs] scummvm master -> 007d68006aaaf1025e246b6a9f7c25fd789958b2

[urukgit]

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:
007d68006a AVALANCHE: Repair ShootEmUp::run().


Commit: 007d68006aaaf1025e246b6a9f7c25fd789958b2
    https://github.com/scummvm/scummvm/commit/007d68006aaaf1025e246b6a9f7c25fd789958b2
Author: uruk (koppirnyo at gmail.com)
Date: 2014-03-01T14:29:01-08:00

Commit Message:
AVALANCHE: Repair ShootEmUp::run().

Changed paths:
    engines/avalanche/shootemup.cpp



diff --git a/engines/avalanche/shootemup.cpp b/engines/avalanche/shootemup.cpp
index c85004d..8d61316 100644
--- a/engines/avalanche/shootemup.cpp
+++ b/engines/avalanche/shootemup.cpp
@@ -117,7 +117,7 @@ void ShootEmUp::run() {
 
 	setup();
 	
-	do {
+	while ((_time != 0) && (!_vm->shouldQuit())) {
 		uint32 beginLoop = _vm->_system->getMillis();
 
 		blankIt();
@@ -141,8 +141,7 @@ void ShootEmUp::run() {
 		uint32 delay = _vm->_system->getMillis() - beginLoop;
 		if (delay <= 55)
 			_vm->_system->delayMillis(55 - delay); // Replaces slowdown(); 55 comes from 18.2 Hz (B Flight).
-
-	} while (_time != 0);
+	};
 
 	_vm->fadeOut();
 	_vm->_graphics->restoreScreen();