[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.252,2.253
Max Horn
fingolfin at users.sourceforge.net
Sun Jun 22 16:10:05 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv19686
Modified Files:
scummvm.cpp
Log Message:
make smush pausing while GUI is up reentrant
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.252
retrieving revision 2.253
diff -u -d -r2.252 -r2.253
--- scummvm.cpp 22 Jun 2003 23:01:06 -0000 2.252
+++ scummvm.cpp 22 Jun 2003 23:09:56 -0000 2.253
@@ -1832,6 +1832,7 @@
_sound->pauseSounds(true);
// Pause playing smush movie
+ bool oldSmushPlay = _smushPlay;
_smushPlay = false;
// Open & run the dialog
@@ -1840,8 +1841,8 @@
// Restore old cursor
updateCursor();
- // Restore playing smush movie
- _smushPlay = true;
+ // Resume playing smush movie, if any
+ _smushPlay = oldSmushPlay;
// Resume sound output
_sound->pauseSounds(old_soundsPaused);
More information about the Scummvm-git-logs
mailing list