[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_draw.cpp,1.54,1.55

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Thu Jan 8 05:04:04 CET 2004


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv24146/driver

Modified Files:
	d_draw.cpp 
Log Message:
Allow quitting during cutscenes and credits again. This is getting a bit
hackish...


Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_draw.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- d_draw.cpp	7 Jan 2004 07:42:00 -0000	1.54
+++ d_draw.cpp	8 Jan 2004 13:03:50 -0000	1.55
@@ -233,7 +233,7 @@
 
 			KeyboardEvent ke;
 
-			if (_vm->_input->readKey(&ke) == RD_OK && ke.keycode == 27) {
+			if ((_vm->_input->readKey(&ke) == RD_OK && ke.keycode == 27) || _vm->_quit) {
 				_vm->_mixer->stopHandle(handle);
 				skipCutscene = true;
 				break;
@@ -252,8 +252,9 @@
 		// it's in use.
 
 		while (handle.isActive()) {
+			_vm->_graphics->updateDisplay(false);
 			_vm->_system->delay_msecs(100);
-		};
+		}
 
 		closeTextObject(text[textCounter]);
 





More information about the Scummvm-git-logs mailing list