diff options
author | Littleboy | 2011-06-28 22:10:29 -0400 |
---|---|---|
committer | Littleboy | 2011-06-28 22:13:40 -0400 |
commit | 6eace0ca759bc62b6b0b6cf69a4341b4d1bb43e4 (patch) | |
tree | 662f45a755c6ac8bf866276781746867395a74b5 /engines/lastexpress/game/entities.cpp | |
parent | d1341387e3c396aa6b48b39379afc9e201448048 (diff) | |
download | scummvm-rg350-6eace0ca759bc62b6b0b6cf69a4341b4d1bb43e4.tar.gz scummvm-rg350-6eace0ca759bc62b6b0b6cf69a4341b4d1bb43e4.tar.bz2 scummvm-rg350-6eace0ca759bc62b6b0b6cf69a4341b4d1bb43e4.zip |
LASTEXPRESS: Move sound queue related functions to a separate class
- Implement missing queue reset function
- Cleanup SoundManager::playLoopingSound()
Diffstat (limited to 'engines/lastexpress/game/entities.cpp')
-rw-r--r-- | engines/lastexpress/game/entities.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp index 0fa3af36b7..8dd2c26c19 100644 --- a/engines/lastexpress/game/entities.cpp +++ b/engines/lastexpress/game/entities.cpp @@ -71,6 +71,8 @@ #include "lastexpress/game/sound.h" #include "lastexpress/game/state.h" +#include "lastexpress/sound/queue.h" + #include "lastexpress/graphics.h" #include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" @@ -299,7 +301,7 @@ void Entities::setupChapter(ChapterIndex chapter) { memset(&_compartments1, 0, sizeof(_compartments1)); memset(&_positions, 0, sizeof(_positions)); - getSound()->resetQueue(kSoundType13); + getSoundQueue()->resetQueue(kSoundType13); } // we skip the header when doing entity setup @@ -369,8 +371,8 @@ void Entities::resetState(EntityIndex entityIndex) { getData(entityIndex)->currentCall = 0; getData(entityIndex)->inventoryItem = kItemNone; - if (getSound()->isBuffered(entityIndex)) - getSound()->removeFromQueue(entityIndex); + if (getSoundQueue()->isBuffered(entityIndex)) + getSoundQueue()->removeFromQueue(entityIndex); clearSequences(entityIndex); |