[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.157,2.158 scummvm.cpp,2.229,2.230

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv14665

Modified Files:
	gfx.cpp scummvm.cpp 
Log Message:
allow quit during smush playback; cleanup

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.157
retrieving revision 2.158
diff -u -d -r2.157 -r2.158
--- gfx.cpp	8 Jun 2003 15:17:14 -0000	2.157
+++ gfx.cpp	9 Jun 2003 01:32:36 -0000	2.158
@@ -2313,7 +2313,7 @@
 	w = vs->width / width;
 	h = vs->height / height;
 
-	// When used used correctly, vs->width % width and vs->height % height
+	// When used correctly, vs->width % width and vs->height % height
 	// should both be zero, but just to be safe...
 
 	if (vs->width % width)

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.229
retrieving revision 2.230
diff -u -d -r2.229 -r2.230
--- scummvm.cpp	9 Jun 2003 01:06:29 -0000	2.229
+++ scummvm.cpp	9 Jun 2003 01:32:36 -0000	2.230
@@ -1123,6 +1123,9 @@
 	checkExecVerbs();
 	checkAndRunSentenceScript();
 
+	if (_quit)
+		return 0;
+
 	// HACK: If a load was requested, immediately perform it. This avoids
 	// drawing the current room right after the load is request but before
 	// it is performed. That was annoying esp. if you loaded while a SMUSH
@@ -2253,7 +2256,7 @@
 
 	start_time = _system->get_msecs();
 
-	for (;;) {
+	while (!_quit) {
 		parseEvents();
 
 		_sound->updateCD(); // Loop CD Audio if needed
@@ -2335,6 +2338,7 @@
 	
 		case OSystem::EVENT_QUIT:
 			_quit = true;
+			_videoFinished = true;
 			break;
 	
 		default: