diff options
author | Paul Gilbert | 2011-06-19 23:21:02 +1000 |
---|---|---|
committer | Paul Gilbert | 2011-06-19 23:21:02 +1000 |
commit | 85e4e2933adcb3c9472b7a7095bb7b481a973fa0 (patch) | |
tree | 94c9369d7dda52e9336fc8951ebf8fd339462e75 /engines/tsage | |
parent | a15d233dc4f83c04252442496594aa1658f6f83c (diff) | |
download | scummvm-rg350-85e4e2933adcb3c9472b7a7095bb7b481a973fa0.tar.gz scummvm-rg350-85e4e2933adcb3c9472b7a7095bb7b481a973fa0.tar.bz2 scummvm-rg350-85e4e2933adcb3c9472b7a7095bb7b481a973fa0.zip |
TSAGE: Fix signalling an action when a song stops
Diffstat (limited to 'engines/tsage')
-rw-r--r-- | engines/tsage/sound.cpp | 10 | ||||
-rw-r--r-- | engines/tsage/sound.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp index 88b2c2abb2..1288ba9367 100644 --- a/engines/tsage/sound.cpp +++ b/engines/tsage/sound.cpp @@ -1454,7 +1454,7 @@ void Sound::unPrime() { stop(); } -void Sound::_prime(int soundResID, bool queueFlag) { +void Sound::_prime(int soundResID, bool dontQueue) { if (_primed) unPrime(); @@ -1485,8 +1485,8 @@ void Sound::_prime(int soundResID, bool queueFlag) { _remoteReceiver = ALLOCATE(200); } - _soPrimeSound(queueFlag); - if (queueFlag) + _soPrimeSound(dontQueue); + if (!dontQueue) _soundManager->addToSoundList(this); _primed = true; @@ -1675,8 +1675,8 @@ void Sound::release() { _hold = -1; } -void Sound::_soPrimeSound(bool queueFlag) { - if (!queueFlag) { +void Sound::_soPrimeSound(bool dontQueue) { + if (!dontQueue) { _priority = (_fixedPriority != -1) ? _fixedPriority : _sndResPriority; _loop = !_fixedLoop ? _fixedLoop : _sndResLoop; _pausedCount = 0; diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h index 105b2a43bf..8fcb1c38ff 100644 --- a/engines/tsage/sound.h +++ b/engines/tsage/sound.h @@ -247,7 +247,7 @@ public: class Sound: public EventHandler { private: - void _prime(int soundResID, bool queueFlag); + void _prime(int soundResID, bool dontQueue); void _unPrime(); void orientAfterRestore(); public: @@ -329,7 +329,7 @@ public: void orientAfterDriverChange(); // _so methods - void _soPrimeSound(bool queueFlag); + void _soPrimeSound(bool dontQueue); void _soSetTimeIndex(uint timeIndex); bool _soServiceTracks(); void _soPrimeChannelData(); |