fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add -basegame support. Update hack to hide texture failure dev-spam to include dds files.

Browse source
This commit is contained in:
Shpoike 2020-07-22 02:37:16 +01:00
parent 71b6fc11ed
commit 7a6ee08281
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Quake/common.c
View file

@ -1935,6 +1935,7 @@ static int COM_FindFile (const char *filename, int *handle, FILE **file,
&& strcmp(ext, "png") != 0
&& strcmp(ext, "jpg") != 0
&& strcmp(ext, "jpeg") != 0
&& strcmp(ext, "dds") != 0
&& strcmp(ext, "lit") != 0
&& strcmp(ext, "ent") != 0)
Con_DPrintf ("FindFile: can't find %s\n", filename);
@ -2796,8 +2797,29 @@ void COM_InitFilesystem (void) //johnfitz -- modified based on topaz's tutorial
if ((com_basedir[j-1] == '\\') || (com_basedir[j-1] == '/'))
com_basedir[j-1] = 0;
// start up with GAMENAME by default (id1)
COM_AddGameDirectory (GAMENAME);
i = COM_CheckParmNext (i, "-basegame");
if (i)
{ //-basegame:
// a) replaces all hardcoded dirs (read: alternative to id1)
// b) isn't flushed on normal gamedir switches (like id1).
com_modified = true; //shouldn't be relevant when not using id content... but we don't really know.
for(;; i = COM_CheckParmNext (i, "-basegame"))
{
if (!i || i >= com_argc-1)
break;
p = com_argv[i + 1];
if (!*p || !strcmp(p, ".") || strstr(p, "..") || *p=='/' || *p=='\\' || strstr(p, ":"))
Sys_Error ("gamedir should be a single directory name, not a path\n");
if (p != NULL)
COM_AddGameDirectory (p);
}
}
else
{
// start up with GAMENAME by default (id1)
COM_AddGameDirectory (GAMENAME);
}
/* this is the end of our base searchpath:
* any set gamedirs, such as those from -game command line