diff options
| author | Filippos Karapetis | 2015-12-13 17:47:16 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:34:02 +0100 |
| commit | 40b16afcab183189c32ee697e6e027e734d72542 (patch) | |
| tree | 048885d7e7b83aa011c0849cd1c29e96e095874e | |
| parent | ceb5ef18e5490d07c40adb5797f026de05036387 (diff) | |
| download | scummvm-rg350-40b16afcab183189c32ee697e6e027e734d72542.tar.gz scummvm-rg350-40b16afcab183189c32ee697e6e027e734d72542.tar.bz2 scummvm-rg350-40b16afcab183189c32ee697e6e027e734d72542.zip | |
LAB: Get rid of _unstoppableSoundEffect
_loopSoundEffect is used for the exact same purpose
| -rw-r--r-- | engines/lab/dispman.cpp | 2 | ||||
| -rw-r--r-- | engines/lab/map.cpp | 2 | ||||
| -rw-r--r-- | engines/lab/music.cpp | 3 | ||||
| -rw-r--r-- | engines/lab/music.h | 1 | ||||
| -rw-r--r-- | engines/lab/processroom.cpp | 3 |
5 files changed, 3 insertions, 8 deletions
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp index 0c2f56290e..d5ae0f48b5 100644 --- a/engines/lab/dispman.cpp +++ b/engines/lab/dispman.cpp @@ -102,7 +102,7 @@ void DisplayMan::readPict(const char *filename, bool playOnce, bool onlyDiffData _vm->_music->updateMusic(); - if (!_vm->_music->_unstoppableSoundEffect) + if (!_vm->_music->_loopSoundEffect) _vm->_music->stopSoundEffect(); _dispBitMap->_bytesPerRow = _screenWidth; diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp index 316334f70e..179bba5581 100644 --- a/engines/lab/map.cpp +++ b/engines/lab/map.cpp @@ -86,7 +86,7 @@ void LabEngine::loadMapData() { Common::File *mapFile = _resource->openDataFile("Lab:Maps", MKTAG('M', 'A', 'P', '0')); _music->updateMusic(); - if (!_music->_unstoppableSoundEffect) + if (!_music->_loopSoundEffect) _music->stopSoundEffect(); _maxRooms = mapFile->readUint16LE(); diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp index cca7633e67..1d2527b50e 100644 --- a/engines/lab/music.cpp +++ b/engines/lab/music.cpp @@ -59,7 +59,6 @@ Music::Music(LabEngine *vm) : _vm(vm) { _winMusic = false; _loopSoundEffect = false; _queuingAudioStream = NULL; - _unstoppableSoundEffect = false; _lastMusicRoom = 1; _doReset = true; _waitTillFinished = false; @@ -320,7 +319,7 @@ void Music::resetMusic() { bool Music::readMusic(const char *filename, bool waitTillFinished) { Common::File *file = _vm->_resource->openDataFile(filename, MKTAG('D', 'I', 'F', 'F')); updateMusic(); - if (!_unstoppableSoundEffect) + if (!_loopSoundEffect) stopSoundEffect(); if (!file) diff --git a/engines/lab/music.h b/engines/lab/music.h index 02c68209eb..35fd583ef4 100644 --- a/engines/lab/music.h +++ b/engines/lab/music.h @@ -75,7 +75,6 @@ private: void startMusic(bool restartFl); public: - bool _unstoppableSoundEffect; bool _loopSoundEffect; bool _waitTillFinished; diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp index c09d918fcb..6000f4abf8 100644 --- a/engines/lab/processroom.cpp +++ b/engines/lab/processroom.cpp @@ -296,7 +296,6 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) { break; case PLAYSOUNDCONT: - _music->_unstoppableSoundEffect = true; _music->_loopSoundEffect = true; _music->readMusic((char *)actionList->_data, _music->_waitTillFinished); break; @@ -543,8 +542,6 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) { waitTOF(); } } - - _music->_unstoppableSoundEffect = false; } /** |