AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 03:12:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

add CheckExtensions function, cleanup

Browse Source
This commit is contained in:
Roman Fomin 2024-01-10 00:02:21 +07:00
parent c2ea692e3a
commit d08749244d
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/d_main.c
View File

@ -598,6 +598,30 @@ void D_StartTitle (void)
D_AdvanceDemo(); D_AdvanceDemo();
} }
static boolean CheckExtensions(const char *filename, const char *ext, ...)
{
boolean result = false;
va_list args;
if (M_StringCaseEndsWith(filename, ext))
{
return true;
}
va_start(args, ext);
while (true)
{
const char *arg = va_arg(args, const char *);
if (arg == NULL || (result = M_StringCaseEndsWith(filename, arg)))
{
break;
}
}
va_end(args);
return result;
}
char **tempdirs = NULL; char **tempdirs = NULL;
static void AutoLoadWADs(const char *path); static void AutoLoadWADs(const char *path);
@ -606,9 +630,9 @@ static boolean D_AddZipFile(const char *file)
{ {
int i; int i;
mz_zip_archive zip_archive; mz_zip_archive zip_archive;
char *str, *tempdir; char *str, *tempdir, counter[8];
if (!M_StringCaseEndsWith(file, ".zip") && !M_StringCaseEndsWith(file, ".pk3")) if (!CheckExtensions(file, ".zip", ".pk3", NULL))
{ {
return false; return false;
} }
@ -619,12 +643,8 @@ static boolean D_AddZipFile(const char *file)
I_Error("D_AddZipFile: Failed to open %s", file); I_Error("D_AddZipFile: Failed to open %s", file);
} }
{ M_snprintf(counter, sizeof(counter), "%04d", array_size(tempdirs));
static int cnt = 0; str = M_StringJoin("_", counter, "_", PROJECT_SHORTNAME, "_", M_BaseName(file), NULL);
char buf[8];
M_snprintf(buf, sizeof(buf), "%04d", cnt++);
str = M_StringJoin("_", buf, "_", PROJECT_SHORTNAME, "_", M_BaseName(file), NULL);
}
tempdir = M_TempFile(str); tempdir = M_TempFile(str);
free(str); free(str);
M_MakeDirectory(tempdir); M_MakeDirectory(tempdir);
@ -645,9 +665,7 @@ static boolean D_AddZipFile(const char *file)
if (name[0] == '.') if (name[0] == '.')
continue; continue;
if (M_StringCaseEndsWith(name, ".wad") || M_StringCaseEndsWith(name, ".lmp") || if (CheckExtensions(name, ".wad", ".lmp", ".ogg", ".flac", ".mp3", ".kvx", NULL))
M_StringCaseEndsWith(name, ".ogg") || M_StringCaseEndsWith(name, ".flac") ||
M_StringCaseEndsWith(name, ".mp3") || M_StringCaseEndsWith(name, ".kvx"))
{ {
char *dest = M_StringJoin(tempdir, DIR_SEPARATOR_S, name, NULL); char *dest = M_StringJoin(tempdir, DIR_SEPARATOR_S, name, NULL);