diff options
| author | Christopher Page | 2008-07-11 01:22:37 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-07-11 01:22:37 +0000 |
| commit | e9c6b03fc73ad5d556eb56afed6e55ef1b0bef67 (patch) | |
| tree | f048b01ac7a0ec7d4ec754ef567feaa798c86a66 /engines/scumm/he/cup_player_he.cpp | |
| parent | cbadb51ce75f2ec599203433b50c9d4bf5f51728 (diff) | |
| download | scummvm-rg350-e9c6b03fc73ad5d556eb56afed6e55ef1b0bef67.tar.gz scummvm-rg350-e9c6b03fc73ad5d556eb56afed6e55ef1b0bef67.tar.bz2 scummvm-rg350-e9c6b03fc73ad5d556eb56afed6e55ef1b0bef67.zip | |
SCUMM works with new GMM implementation
svn-id: r33001
Diffstat (limited to 'engines/scumm/he/cup_player_he.cpp')
| -rw-r--r-- | engines/scumm/he/cup_player_he.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index e611c85e9d..685bd00065 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->quit()) { 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->quit()) { _vm->parseEvents(); _system->delayMillis(10); } @@ -496,7 +496,7 @@ void CUP_Player::handleTOIL(Common::SeekableReadStream &dataStream, uint32 dataS for (int i = 0; i < kSfxChannels; ++i) { waitForSfxChannel(i); } - _vm->_quit = true; + _vm->quitGame(); break; case 7: { int channelSync = dataStream.readUint32LE(); |