From e1927b693f74dd6007dcae715660dd6b77b16d49 Mon Sep 17 00:00:00 2001 From: wolfy852 Date: Wed, 8 Feb 2023 22:23:54 -0600 Subject: [PATCH] Correct shadowed declaration and missing include --- src/deh_soc.c | 8 ++++---- src/s_sound.c | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/deh_soc.c b/src/deh_soc.c index a4645b518..6e4eac3ee 100644 --- a/src/deh_soc.c +++ b/src/deh_soc.c @@ -1168,12 +1168,12 @@ void readlevelheader(MYFILE *f, char * name) mapheaderinfo[num]->musname[0][0] = 0; // becomes empty string else { - UINT8 i = 0; + UINT8 j = 0; // i was declared elsewhere tmp = strtok(word2, ","); do { - deh_strlcpy(mapheaderinfo[num]->musname[i], tmp, - sizeof(mapheaderinfo[num]->musname[i]), va("Level header %d: music", num)); - i += 1; + deh_strlcpy(mapheaderinfo[num]->musname[j], tmp, + sizeof(mapheaderinfo[num]->musname[j]), va("Level header %d: music", num)); + j += 1; } while ((tmp = strtok(NULL,",")) != NULL); } } diff --git a/src/s_sound.c b/src/s_sound.c index a483bbeb5..09154b286 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -32,6 +32,7 @@ #include "lua_hook.h" // MusicChange hook #include "byteptr.h" #include "k_menu.h" // M_PlayMenuJam +#include "m_random.h" // P_RandomKey #ifdef HW3SOUND // 3D Sound Interface