xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

doom: fix bogus pointer arithmetic, do sfx initialization in two passes for linked sounds

Browse source
This commit is contained in:
cinap_lenrek 2015-10-08 00:37:54 +02:00
parent fa1f9f7ca6
commit 285d96be4d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/src/games/doom/i_sound.c
View file

@ -135,17 +135,20 @@ void I_InitSound(void)
/* Initialize external data (all sounds) at start, keep static. */ /* Initialize external data (all sounds) at start, keep static. */
for (i=1 ; i<NUMSFX ; i++) for (i=1 ; i<NUMSFX ; i++)
{ {
/* Alias? Example is the chaingun sound linked to pistol. */
if (!S_sfx[i].link) if (!S_sfx[i].link)
{ {
/* Load data from WAD file. */ /* Load data from WAD file. */
S_sfx[i].data = getsfx( S_sfx[i].name, &lengths[i] ); S_sfx[i].data = getsfx( S_sfx[i].name, &lengths[i] );
} }
else }
/* Alias? Example is the chaingun sound linked to pistol. */
for (i=1 ; i<NUMSFX ; i++)
{
if (S_sfx[i].link)
{ {
/* Previously loaded already? */ /* Previously loaded already? */
S_sfx[i].data = S_sfx[i].link->data; S_sfx[i].data = S_sfx[i].link->data;
lengths[i] = lengths[(S_sfx[i].link - S_sfx)/sizeof(sfxinfo_t)]; lengths[i] = lengths[S_sfx[i].link - S_sfx];
} }
} }