Leak_Technologies/HULL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fallback on legacy game library name if canonical name doesn't exist

Browse Source
This commit is contained in:
Tim Angus 2025-08-22 09:53:35 +01:00
parent 8dfedc60c1
commit fe9f611ed5
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
code/qcommon/files.c
View File

@ -1449,15 +1449,12 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
searchpath_t *search, *lastSearch;
directory_t *dir;
pack_t *pack;
char dllName[MAX_OSPATH], qvmName[MAX_OSPATH];
char qvmName[MAX_OSPATH];
char *netpath;
if(!fs_searchpaths)
Com_Error(ERR_FATAL, "Filesystem call made without initialization");
if(enableDll)
Com_sprintf(dllName, sizeof(dllName), "%s" DLL_EXT, name);
Com_sprintf(qvmName, sizeof(qvmName), "vm/%s.qvm", name);
lastSearch = *startSearch;
@ -1474,14 +1471,28 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
if(enableDll)
{
netpath = FS_BuildOSPath(dir->path, dir->gamedir, dllName);
if(FS_FileInPathExists(netpath))
// The original Q3 put the architecture in the library name; in case
// we're loading an old binary only mod, fallback on this format if
// the architecture-less library doesn't exist
const char *dllNameFormats[] =
{
Q_strncpyz(found, netpath, foundlen);
*startSearch = search;
"%s" DLL_EXT,
"%s" ARCH_STRING DLL_EXT
};
return VMI_NATIVE;
for(int i = 0; i < ARRAY_LEN(dllNameFormats); i++)
{
char dllName[MAX_OSPATH];
Com_sprintf(dllName, sizeof(dllName), dllNameFormats[i], name);
netpath = FS_BuildOSPath(dir->path, dir->gamedir, dllName);
if(FS_FileInPathExists(netpath))
{
Q_strncpyz(found, netpath, foundlen);
*startSearch = search;
return VMI_NATIVE;
}
}
}