[Scummvm-cvs-logs] scummvm master -> fe613524e5f93b2f66613ef2e77608407eba2dd6

fuzzie fuzzie at fuzzie.org
Tue Mar 29 20:23:40 CEST 2011


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

Summary:
ff9f08aa41 MOHAWK: Only stop the last-played sound in LB's playSound.
fe613524e5 MOHAWK: Looks like LBAnimation ignores sound priorities after all.


Commit: ff9f08aa411c68e027f594eca16404d920f7c820
    https://github.com/scummvm/scummvm/commit/ff9f08aa411c68e027f594eca16404d920f7c820
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-29T11:22:25-07:00

Commit Message:
MOHAWK: Only stop the last-played sound in LB's playSound.

This might need a version check, but seems to be fine without.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 95d55a6..3d1c32f 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -571,7 +571,8 @@ bool MohawkEngine_LivingBooks::playSound(LBItem *source, uint16 resourceId) {
 			return false;
 	}
 
-	_sound->stopSound();
+	if (_lastSoundId)
+		_sound->stopSound(_lastSoundId);
 
 	_sound->playSound(resourceId);
 	_lastSoundId = resourceId;


Commit: fe613524e5f93b2f66613ef2e77608407eba2dd6
    https://github.com/scummvm/scummvm/commit/fe613524e5f93b2f66613ef2e77608407eba2dd6
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-29T11:22:25-07:00

Commit Message:
MOHAWK: Looks like LBAnimation ignores sound priorities after all.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 3d1c32f..356ad94 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -1695,7 +1695,7 @@ void LBAnimation::stop() {
 
 void LBAnimation::playSound(uint16 resourceId) {
 	_currentSound = resourceId;
-	_vm->playSound(_parent, _currentSound);
+	_vm->_sound->playSound(_currentSound);
 }
 
 bool LBAnimation::soundPlaying(uint16 resourceId) {






More information about the Scummvm-git-logs mailing list