fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-03-12 04:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't use ids1's replacement models for mods that have their own incompatible changes. Resolves https://github.com/Shpoike/Quakespasm/issues/101

Browse source
This commit is contained in:
Shpoike 2022-08-23 11:52:34 +01:00
parent b3bec67cb1
commit 037436b2bc
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Quake/gl_model.c
View file

@ -367,6 +367,7 @@ static qmodel_t *Mod_LoadModel (qmodel_t *mod, qboolean crash)
const char *exts = r_replacemodels.string;
char *e;
char newname[MAX_QPATH];
unsigned int origpathid;
buf = NULL;
q_strlcpy(newname, mod->name, sizeof(newname));
e = (char*)COM_FileGetExtension(newname);
@ -375,7 +376,15 @@ static qmodel_t *Mod_LoadModel (qmodel_t *mod, qboolean crash)
q_strlcpy(e, com_token, sizeof(newname)-(e-newname));
buf = COM_LoadStackFile (newname, stackbuf, sizeof(stackbuf), & mod->path_id);
if (buf)
{
if (COM_FileExists(mod->name, &origpathid))
if (origpathid > mod->path_id)
{
Con_DPrintf("Ignoring %s from lower priority path\n", newname);
continue;
}
break;
}
}
if (!buf)
buf = COM_LoadStackFile (mod->name, stackbuf, sizeof(stackbuf), & mod->path_id);