mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-12-01 00:12:27 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
2ed287428c
2 changed files with 2 additions and 1 deletions
|
@ -1321,7 +1321,7 @@ sfxinfo_t *S_LoadSound(sfxinfo_t *sfx)
|
|||
// If the sound is voc, use the custom loader.
|
||||
if (strncmp ((const char *)sfxstart, "Creative Voice File", 19) == 0)
|
||||
{
|
||||
sfx->data = GSnd->LoadSoundVoc(sfxstart, len);
|
||||
sfx->data = GSnd->LoadSoundVoc(sfxstart, size);
|
||||
}
|
||||
// If the sound is raw, just load it as such.
|
||||
// Otherwise, try the sound as DMX format.
|
||||
|
|
|
@ -494,6 +494,7 @@ SoundHandle SoundRenderer::LoadSoundVoc(BYTE *sfxdata, int length)
|
|||
break;
|
||||
default: break;
|
||||
}
|
||||
i += blocksize;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue