[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.514,2.515 scumm.h,1.334,1.335
Max Horn
fingolfin at users.sourceforge.net
Sun Dec 21 10:37:01 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv19365
Modified Files:
scummvm.cpp scumm.h
Log Message:
The rewritten Timer class actually allows us to get rid of several evil hacks in the SMUSH code (which were previously needed to avoid various race conditions/crashes/hangups)
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.514
retrieving revision 2.515
diff -u -d -r2.514 -r2.515
--- scummvm.cpp 21 Dec 2003 15:29:51 -0000 2.514
+++ scummvm.cpp 21 Dec 2003 18:36:19 -0000 2.515
@@ -315,7 +315,6 @@
_smushFrameRate = 0;
_insaneState = false;
_videoFinished = false;
- _smushPlay = false;
_quit = false;
_pauseDialog = NULL;
_optionsDialog = NULL;
@@ -2543,18 +2542,11 @@
bool old_soundsPaused = _sound->_soundsPaused;
_sound->pauseSounds(true);
- // Pause playing smush movie
- bool oldSmushPlay = _smushPlay;
- _smushPlay = false;
-
// Open & run the dialog
int result = dialog.runModal();
// Restore old cursor
updateCursor();
-
- // Resume playing smush movie, if any
- _smushPlay = oldSmushPlay;
// Resume sound output
_sound->pauseSounds(old_soundsPaused);
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -d -r1.334 -r1.335
--- scumm.h 17 Dec 2003 17:12:09 -0000 1.334
+++ scumm.h 21 Dec 2003 18:36:20 -0000 1.335
@@ -338,7 +338,6 @@
int _smushFrameRate;
bool _insaneState;
bool _videoFinished;
- bool _smushPlay;
void pauseGame();
void restart();
More information about the Scummvm-git-logs
mailing list