diff options
| author | Max Horn | 2003-06-22 23:09:56 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-22 23:09:56 +0000 |
| commit | f108fe66fe6a3efd58f44d71e8f721843cc570ea (patch) | |
| tree | dfe4fab2bf799a8020d15e5c489b477850dfa2f1 /scumm | |
| parent | b85d2a9a2a9097b547c005ded6b91774623e4866 (diff) | |
| download | scummvm-rg350-f108fe66fe6a3efd58f44d71e8f721843cc570ea.tar.gz scummvm-rg350-f108fe66fe6a3efd58f44d71e8f721843cc570ea.tar.bz2 scummvm-rg350-f108fe66fe6a3efd58f44d71e8f721843cc570ea.zip | |
make smush pausing while GUI is up reentrant
svn-id: r8639
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 5 | ||||
| -rw-r--r-- | scumm/smush/smush_player.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 3ca599c6ec..012861e17f 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1832,6 +1832,7 @@ int Scumm::runDialog(Dialog *dialog) { _sound->pauseSounds(true); // Pause playing smush movie + bool oldSmushPlay = _smushPlay; _smushPlay = false; // Open & run the dialog @@ -1840,8 +1841,8 @@ int Scumm::runDialog(Dialog *dialog) { // 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); diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index c3e9c829c7..44bace3e52 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -842,7 +842,7 @@ void SmushPlayer::setupAnim(const char *file, const char *directory) { _sf[i]->loadFont(file_font, directory); } } else { - error("SmushPlayer::init() Unknown font setup for game"); + error("SmushPlayer::setupAnim() Unknown font setup for game"); } delete sub; |