libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 06:41:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

MOHAWK: Check isAmbient in LB sound priority code.

Browse Source
This commit is contained in:
Alyssa Milburn 2011-03-29 21:19:46 +02:00
parent feefced3ce
commit 01b7a2c774
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
engines/mohawk/livingbooks.cpp
View File

@ -562,22 +562,25 @@ bool MohawkEngine_LivingBooks::playSound(LBItem *source, uint16 resourceId) {
if (_lastSoundId && !_sound->isPlaying(_lastSoundId))
_lastSoundId = 0;
if (!_soundLockOwner) {
if (_lastSoundId && _lastSoundOwner != source->getId())
if (source->getSoundPriority() >= _lastSoundPriority)
if (!source->isAmbient() || !_sound->isPlaying()) {
if (!_soundLockOwner) {
if (_lastSoundId && _lastSoundOwner != source->getId())
if (source->getSoundPriority() >= _lastSoundPriority)
return false;
} else {
if (_soundLockOwner != source->getId() && source->getSoundPriority() >= _maxSoundPriority)
return false;
} else {
if (_soundLockOwner != source->getId() && source->getSoundPriority() >= _maxSoundPriority)
return false;
}
if (_lastSoundId)
_sound->stopSound(_lastSoundId);
_lastSoundOwner = source->getId();
_lastSoundPriority = source->getSoundPriority();
}
if (_lastSoundId)
_sound->stopSound(_lastSoundId);
_sound->playSound(resourceId);
_lastSoundId = resourceId;
_lastSoundOwner = source->getId();
_lastSoundPriority = source->getSoundPriority();
_sound->playSound(resourceId);
return true;
}
@ -588,7 +591,7 @@ void MohawkEngine_LivingBooks::lockSound(LBItem *owner, bool lock) {
return;
}
if (_soundLockOwner)
if (_soundLockOwner || (owner->isAmbient() && _sound->isPlaying()))
return;
if (_lastSoundId && !_sound->isPlaying(_lastSoundId))

1
engines/mohawk/livingbooks.h
View File

@ -366,6 +366,7 @@ public:
uint16 getId() { return _itemId; }
uint16 getSoundPriority() { return _soundMode; }
bool isAmbient() { return _isAmbient; }
protected:
MohawkEngine_LivingBooks *_vm;