diff options
| author | Littleboy | 2011-07-04 14:24:50 -0400 |
|---|---|---|
| committer | Littleboy | 2011-07-04 14:26:31 -0400 |
| commit | 47e9a6ccdc6a162309ddaba2e6f6f83d5a047990 (patch) | |
| tree | 71cc0c876b58b2083d664930a3322702b6b20df4 /engines/lastexpress/sound/queue.cpp | |
| parent | 14733b6112f214c1c37e01a21bef6de7ac463c68 (diff) | |
| download | scummvm-rg350-47e9a6ccdc6a162309ddaba2e6f6f83d5a047990.tar.gz scummvm-rg350-47e9a6ccdc6a162309ddaba2e6f6f83d5a047990.tar.bz2 scummvm-rg350-47e9a6ccdc6a162309ddaba2e6f6f83d5a047990.zip | |
LASTEXPRESS: Move sound filtering to base Sound class
- Rename kSoundStatusRemoved to kSoundStatusClosed
- Rename kSoundStatusClear2 to kSoundStatusCached
- Remove sound cache handling
Diffstat (limited to 'engines/lastexpress/sound/queue.cpp')
| -rw-r--r-- | engines/lastexpress/sound/queue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/lastexpress/sound/queue.cpp b/engines/lastexpress/sound/queue.cpp index ad5c9bf4e3..b2f48cf4c1 100644 --- a/engines/lastexpress/sound/queue.cpp +++ b/engines/lastexpress/sound/queue.cpp @@ -292,11 +292,11 @@ void SoundQueue::updateSubtitles() { if (!(status & kSoundStatus_40) || status & kSoundStatus_180 || soundEntry->getTime() == 0 - || (status & kSoundStatusFilterVariant) < 6 + || (status & kSoundStatusFilter) < 6 || ((getFlags()->nis & 0x8000) && soundEntry->getPriority() < 90)) { current_index = 0; } else { - current_index = soundEntry->getPriority() + (status & kSoundStatusFilterVariant); + current_index = soundEntry->getPriority() + (status & kSoundStatusFilter); if (_currentSubtitle == (*i)) current_index += 4; |