stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Monster Iestyn 2018-11-03 12:29:04 +00:00
commit 02b14959cc
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/w_wad.c
View file

@ -381,6 +381,8 @@ UINT16 W_LoadWadFile(const char *filename)
if (fread(&header, 1, sizeof header, handle) < sizeof header) if (fread(&header, 1, sizeof header, handle) < sizeof header)
{ {
CONS_Alert(CONS_ERROR, M_GetText("Can't read wad header from %s because %s\n"), filename, strerror(ferror(handle))); CONS_Alert(CONS_ERROR, M_GetText("Can't read wad header from %s because %s\n"), filename, strerror(ferror(handle)));
if (handle)
fclose(handle);
return INT16_MAX; return INT16_MAX;
} }
@ -391,6 +393,8 @@ UINT16 W_LoadWadFile(const char *filename)
&& memcmp(header.identification, "SDLL", 4) != 0) && memcmp(header.identification, "SDLL", 4) != 0)
{ {
CONS_Alert(CONS_ERROR, M_GetText("%s does not have a valid WAD header\n"), filename); CONS_Alert(CONS_ERROR, M_GetText("%s does not have a valid WAD header\n"), filename);
if (handle)
fclose(handle);
return INT16_MAX; return INT16_MAX;
} }
@ -405,6 +409,8 @@ UINT16 W_LoadWadFile(const char *filename)
{ {
CONS_Alert(CONS_ERROR, M_GetText("Wadfile directory in %s is corrupted (%s)\n"), filename, strerror(ferror(handle))); CONS_Alert(CONS_ERROR, M_GetText("Wadfile directory in %s is corrupted (%s)\n"), filename, strerror(ferror(handle)));
free(fileinfov); free(fileinfov);
if (handle)
fclose(handle);
return INT16_MAX; return INT16_MAX;
} }
@ -462,6 +468,8 @@ UINT16 W_LoadWadFile(const char *filename)
if (!memcmp(wadfiles[i]->md5sum, md5sum, 16)) if (!memcmp(wadfiles[i]->md5sum, md5sum, 16))
{ {
CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename); CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename);
if (handle)
fclose(handle);
return INT16_MAX; return INT16_MAX;
} }
} }