aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-09-06 23:35:42 +0000
committerMax Horn2003-09-06 23:35:42 +0000
commit4e07649c972732dd9a97c77927cf9039e65f450b (patch)
tree51413c30bf82c2e5c18c1e0fa6bd9f696fbfcb30
parent1f59b15f91998bf0b2fdd3fe452fbaca947d67ba (diff)
downloadscummvm-rg350-4e07649c972732dd9a97c77927cf9039e65f450b.tar.gz
scummvm-rg350-4e07649c972732dd9a97c77927cf9039e65f450b.tar.bz2
scummvm-rg350-4e07649c972732dd9a97c77927cf9039e65f450b.zip
small tweak requested by unused on IRC
svn-id: r10053
-rw-r--r--scumm/sound.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 377adfb46e..5a7a2c13ec 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -436,8 +436,8 @@ void Sound::playSound(int soundID) {
size = READ_BE_UINT16(ptr + 12);
rate = 3579545 / READ_BE_UINT16(ptr + 20);
sound = (char *)malloc(size);
- int vol = ptr[24] << 1;
- memcpy(sound,ptr + READ_BE_UINT16(ptr + 8),size);
+ int vol = ptr[24] * 4;
+ memcpy(sound,ptr + READ_BE_UINT16(ptr + 8), size);
if ((_scumm->_features & GF_AMIGA) && (READ_BE_UINT16(ptr + 16) || READ_BE_UINT16(ptr + 6))) {
// the first check is for pitch-bending looped sounds (i.e. "pouring liquid", "biplane dive", etc.)
// the second check is for simple looped sounds
@@ -466,7 +466,7 @@ void Sound::playSound(int soundID) {
rate = 3579545 / READ_BE_UINT16(ptr + 2);
if ((READ_BE_UINT16(ptr) == 0x357c) && (READ_BE_UINT16(ptr + 4) == 8))
- vol = READ_BE_UINT16(ptr + 2) * 2;
+ vol = READ_BE_UINT16(ptr + 2) * 4;
ptr += 2;
i += 2;
}