[Scummvm-cvs-logs] scummvm master -> 04cb669ff37689c78336ab5cd2e5c9c14b4202f3

fuzzie fuzzie at fuzzie.org
Tue Mar 29 16:53:13 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
04cb669ff3 MOHAWK: Fix priority check in LB's lockSound().


Commit: 04cb669ff37689c78336ab5cd2e5c9c14b4202f3
    https://github.com/scummvm/scummvm/commit/04cb669ff37689c78336ab5cd2e5c9c14b4202f3
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-29T07:49:42-07:00

Commit Message:
MOHAWK: Fix priority check in LB's lockSound().

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 87fa55e..292e8a3 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -595,7 +595,7 @@ void MohawkEngine_LivingBooks::lockSound(LBItem *owner, bool lock) {
 
 	_soundLockOwner = owner->getId();
 	_maxSoundPriority = owner->getSoundPriority();
-	if (_lastSoundId && _lastSoundPriority < _maxSoundPriority) {
+	if (_lastSoundId && _maxSoundPriority <= _lastSoundPriority) {
 		_sound->stopSound(_lastSoundId);
 		_lastSoundId = 0;
 	}






More information about the Scummvm-git-logs mailing list