aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/smush/smush_player.cpp
diff options
context:
space:
mode:
authorMax Horn2008-09-30 12:27:38 +0000
committerMax Horn2008-09-30 12:27:38 +0000
commit9b160804ab8878b55efb032fb62ee359ab97f848 (patch)
treeaa0ac6d0aec815de5f2368acc00971948cf3fa0b /engines/scumm/smush/smush_player.cpp
parent87917e06d94e36c483011deaf1eb4a5dba6eeb97 (diff)
downloadscummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.tar.gz
scummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.tar.bz2
scummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.zip
Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
Diffstat (limited to 'engines/scumm/smush/smush_player.cpp')
-rw-r--r--engines/scumm/smush/smush_player.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 3b17f3ae10..55cdc2a25e 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -1254,7 +1254,7 @@ void SmushPlayer::play(const char *filename, int32 speed, int32 offset, int32 st
}
if (_endOfFile)
break;
- if (_vm->quit() || _vm->_saveLoadFlag || _vm->_smushVideoShouldFinish) {
+ if (_vm->shouldQuit() || _vm->_saveLoadFlag || _vm->_smushVideoShouldFinish) {
_smixer->stop();
_vm->_mixer->stopHandle(_compressedFileSoundHandle);
_vm->_mixer->stopHandle(_IACTchannel);