mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-23 03:52:12 -04:00
fix M_StringJoin calls
This commit is contained in:
parent
51cb24de4a
commit
76604bca42
@ -743,7 +743,7 @@ static void LoadBaseFile(void)
|
|||||||
|
|
||||||
if (d.dir && d.func)
|
if (d.dir && d.func)
|
||||||
{
|
{
|
||||||
char *s = M_StringJoin(d.func(), DIR_SEPARATOR_S, d.dir, NULL);
|
char *s = M_StringJoin(d.func(), DIR_SEPARATOR_S, d.dir);
|
||||||
result = W_InitBaseFile(s);
|
result = W_InitBaseFile(s);
|
||||||
free(s);
|
free(s);
|
||||||
}
|
}
|
||||||
|
@ -399,7 +399,7 @@ static w_handle_t base_handle;
|
|||||||
boolean W_InitBaseFile(const char *path)
|
boolean W_InitBaseFile(const char *path)
|
||||||
{
|
{
|
||||||
char *filename =
|
char *filename =
|
||||||
M_StringJoin(path, DIR_SEPARATOR_S, PROJECT_SHORTNAME ".pk3", NULL);
|
M_StringJoin(path, DIR_SEPARATOR_S, PROJECT_SHORTNAME ".pk3");
|
||||||
|
|
||||||
w_type_t result = w_zip_module.Open(filename, &base_handle);
|
w_type_t result = w_zip_module.Open(filename, &base_handle);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user