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

1 files changed, 6 insertions, 3 deletions

diff --git a/sys/src/games/doom/i_sound.c b/sys/src/games/doom/i_sound.c
index 5ff4715cd..a9a9cc3cd 100644
--- a/sys/src/games/doom/i_sound.c
+++ b/sys/src/games/doom/i_sound.c
@@ -135,17 +135,20 @@ void I_InitSound(void)
 	/* Initialize external data (all sounds) at start, keep static. */
 	for (i=1 ; i<NUMSFX ; i++)
 	{
-		/* Alias? Example is the chaingun sound linked to pistol. */
 		if (!S_sfx[i].link)
 		{
 			/* Load data from WAD file. */
 			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? */
 			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];
 		}
 	}