diff options
| author | Max Horn | 2008-09-30 12:27:38 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-30 12:27:38 +0000 |
| commit | 9b160804ab8878b55efb032fb62ee359ab97f848 (patch) | |
| tree | aa0ac6d0aec815de5f2368acc00971948cf3fa0b /engines/scumm | |
| parent | 87917e06d94e36c483011deaf1eb4a5dba6eeb97 (diff) | |
| download | scummvm-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')
| -rw-r--r-- | engines/scumm/he/cup_player_he.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 9 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index 685bd00065..51176c5df9 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -99,7 +99,7 @@ void CUP_Player::play() { debug(1, "rate %d width %d height %d", _playbackRate, _width, _height); int ticks = _system->getMillis(); - while (_dataSize != 0 && !_vm->quit()) { + while (_dataSize != 0 && !_vm->shouldQuit()) { while (parseNextBlockTag(_fileStream)) { if (_fileStream.ioFailed()) { return; @@ -190,7 +190,7 @@ void CUP_Player::waitForSfxChannel(int channel) { CUP_SfxChannel *sfxChannel = &_sfxChannels[channel]; debug(1, "waitForSfxChannel %d", channel); if ((sfxChannel->flags & kSfxFlagLoop) == 0) { - while (_mixer->isSoundHandleActive(sfxChannel->handle) && !_vm->quit()) { + while (_mixer->isSoundHandleActive(sfxChannel->handle) && !_vm->shouldQuit()) { _vm->parseEvents(); _system->delayMillis(10); } diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index a10af41145..267dd812ae 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -24,7 +24,6 @@ */ - #include "common/config-manager.h" #include "common/md5.h" #include "common/events.h" @@ -1726,7 +1725,7 @@ int ScummEngine::go() { int diff = 0; // Duration of one loop iteration - while (!quit()) { + while (!shouldQuit()) { if (_debugger->isAttached()) _debugger->onFrame(); @@ -1759,7 +1758,7 @@ int ScummEngine::go() { diff = _system->getMillis() - diff; - if (quit()) { + if (shouldQuit()) { // TODO: Maybe perform an autosave on exit? } } @@ -1777,7 +1776,7 @@ void ScummEngine::waitForTimer(int msec_delay) { start_time = _system->getMillis(); - while (!quit()) { + while (!shouldQuit()) { _sound->updateCD(); // Loop CD Audio if needed parseEvents(); _system->updateScreen(); @@ -1900,7 +1899,7 @@ load_game: checkExecVerbs(); checkAndRunSentenceScript(); - if (quit()) + if (shouldQuit()) return; // HACK: If a load was requested, immediately perform it. This avoids 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); |