diff options
| author | Johannes Schickel | 2012-09-07 17:49:17 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-09-08 01:15:32 +0200 |
| commit | b1074543b575bdca64b228272f2dfddda2e98cff (patch) | |
| tree | 21d95d49494fcf6c734233a2cd192fe542fcb2e0 /engines/cine/sound.cpp | |
| parent | 17d6d732ea000400eb1353e1f93b121be524852d (diff) | |
| download | scummvm-rg350-b1074543b575bdca64b228272f2dfddda2e98cff.tar.gz scummvm-rg350-b1074543b575bdca64b228272f2dfddda2e98cff.tar.bz2 scummvm-rg350-b1074543b575bdca64b228272f2dfddda2e98cff.zip | |
CINE: Skip resource header in loadSpl.
This implements a long standing TODO in PaulaSound::playSound.
Diffstat (limited to 'engines/cine/sound.cpp')
| -rw-r--r-- | engines/cine/sound.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index b92c5374bd..6cf3d9b5b9 100644 --- a/engines/cine/sound.cpp +++ b/engines/cine/sound.cpp @@ -1052,12 +1052,10 @@ void PaulaSound::playSound(int channel, int frequency, const uint8 *data, int si // TODO: handle volume slides and repeat debugC(5, kCineDebugSound, "PaulaSound::playSound() channel %d size %d", channel, size); stopSound(channel); - size = MIN<int>(size - SPL_HDR_SIZE, READ_BE_UINT16(data + 4)); - // TODO: consider skipping the header in loadSpl directly if (size > 0) { byte *sound = (byte *)malloc(size); if (sound) { - memcpy(sound, data + SPL_HDR_SIZE, size); + memcpy(sound, data, size); playSoundChannel(channel, frequency, sound, size, volume); } } |