Correct shadowed declaration and missing include

This commit is contained in:
wolfy852 2023-02-08 22:23:54 -06:00
parent 276cba4641
commit e1927b693f
2 changed files with 5 additions and 4 deletions

View file

@ -1168,12 +1168,12 @@ void readlevelheader(MYFILE *f, char * name)
mapheaderinfo[num]->musname[0][0] = 0; // becomes empty string mapheaderinfo[num]->musname[0][0] = 0; // becomes empty string
else else
{ {
UINT8 i = 0; UINT8 j = 0; // i was declared elsewhere
tmp = strtok(word2, ","); tmp = strtok(word2, ",");
do { do {
deh_strlcpy(mapheaderinfo[num]->musname[i], tmp, deh_strlcpy(mapheaderinfo[num]->musname[j], tmp,
sizeof(mapheaderinfo[num]->musname[i]), va("Level header %d: music", num)); sizeof(mapheaderinfo[num]->musname[j]), va("Level header %d: music", num));
i += 1; j += 1;
} while ((tmp = strtok(NULL,",")) != NULL); } while ((tmp = strtok(NULL,",")) != NULL);
} }
} }

View file

@ -32,6 +32,7 @@
#include "lua_hook.h" // MusicChange hook #include "lua_hook.h" // MusicChange hook
#include "byteptr.h" #include "byteptr.h"
#include "k_menu.h" // M_PlayMenuJam #include "k_menu.h" // M_PlayMenuJam
#include "m_random.h" // P_RandomKey
#ifdef HW3SOUND #ifdef HW3SOUND
// 3D Sound Interface // 3D Sound Interface