[Scummvm-cvs-logs] scummvm master -> 3472d95f4546fd1c1212e0f9ef85deaefa23e689
lukaslw
lukaslw at gmail.com
Sun Nov 9 03:07:28 CET 2014
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:
3472d95f45 PRINCE: playSample() - split to sound and speech types to correct volume settings
Commit: 3472d95f4546fd1c1212e0f9ef85deaefa23e689
https://github.com/scummvm/scummvm/commit/3472d95f4546fd1c1212e0f9ef85deaefa23e689
Author: lukaslw (lukaslw at gmail.com)
Date: 2014-11-09T03:05:34+01:00
Commit Message:
PRINCE: playSample() - split to sound and speech types to correct volume settings
Changed paths:
engines/prince/prince.cpp
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 5055c6a..55f12a6 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -754,7 +754,11 @@ void PrinceEngine::playSample(uint16 sampleId, uint16 loopType) {
return;
}
_audioStream[sampleId]->rewind();
- _mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle[sampleId], _audioStream[sampleId], sampleId, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+ if (sampleId < 28) {
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle[sampleId], _audioStream[sampleId], sampleId, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+ } else {
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_soundHandle[sampleId], _audioStream[sampleId], sampleId, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+ }
}
}
More information about the Scummvm-git-logs
mailing list