[Scummvm-cvs-logs] SF.net SVN: scummvm:[43401] scummvm/branches/branch-1-0-0/engines/agos/ sound.cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Sat Aug 15 12:09:53 CEST 2009
Revision: 43401
http://scummvm.svn.sourceforge.net/scummvm/?rev=43401&view=rev
Author: Kirben
Date: 2009-08-15 10:09:53 +0000 (Sat, 15 Aug 2009)
Log Message:
-----------
Backport fix for regression, that caused multiple sounds in Simon the Sorcerer 2 to be cut off.
Modified Paths:
--------------
scummvm/branches/branch-1-0-0/engines/agos/sound.cpp
Modified: scummvm/branches/branch-1-0-0/engines/agos/sound.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/sound.cpp 2009-08-15 10:09:32 UTC (rev 43400)
+++ scummvm/branches/branch-1-0-0/engines/agos/sound.cpp 2009-08-15 10:09:53 UTC (rev 43401)
@@ -633,7 +633,8 @@
if (_effectsPaused)
return;
- _mixer->stopHandle(_effectsHandle);
+ if (_vm->getGameType() == GType_SIMON1)
+ _mixer->stopHandle(_effectsHandle);
_effects->playSound(sound, Audio::Mixer::kSFXSoundType, &_effectsHandle, (_vm->getGameId() == GID_SIMON1CD32) ? 0 : Audio::Mixer::FLAG_UNSIGNED);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list