zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 00:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- backported fix for loading VOC files.

Browse source 
In NAM there is one that needed a bit of extra treatment.
This commit is contained in:
Christoph Oelckers 2020-02-01 17:34:06 +01:00
parent 5b4c9eb7f6
commit 2817bc5508
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/sound/backend/i_sound.cpp
View file

@ -370,7 +370,7 @@ SoundHandle SoundRenderer::LoadSoundVoc(uint8_t *sfxdata, int length)
switch (blocktype) switch (blocktype)
{ {
case 1: // Sound data case 1: // Sound data
if (noextra && (codec == -1 || codec == sfxdata[i+1])) if (/*noextra &*/ (codec == -1 || codec == sfxdata[i + 1])) // NAM contains a VOC where a valid data block follows an extra block.
{ {
frequency = 1000000/(256 - sfxdata[i]); frequency = 1000000/(256 - sfxdata[i]);
channels = 1; channels = 1;
@ -382,6 +382,7 @@ SoundHandle SoundRenderer::LoadSoundVoc(uint8_t *sfxdata, int length)
else okay = false; else okay = false;
len += blocksize - 2; len += blocksize - 2;
} }
else okay = false;
break; break;
case 2: // Sound data continuation case 2: // Sound data continuation
if (codec == -1) if (codec == -1)