fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve robustness in the face of buggy QBSP versions.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6124 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-11-14 00:35:13 +00:00
parent d332496ed4
commit cfff8f49f5
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
engine/gl/gl_model.c
View file

@ -2022,17 +2022,17 @@ void Mod_LoadLighting (model_t *loadmodel, bspx_header_t *bspx, qbyte *mod_base,
if (overrides && !overrides->shifts) if (overrides && !overrides->shifts)
{ {
int size; int size;
overrides->shifts = BSPX_FindLump(bspx, mod_base, "LMSHIFT", &size);
if (size != loadmodel->numsurfaces)
overrides->shifts = NULL;
//if we have shifts, then we probably also have legacy data in the surfaces that we want to override //if we have shifts, then we probably also have legacy data in the surfaces that we want to override
if (!overrides->offsets) if (!overrides->offsets)
{ {
int size; int size;
overrides->offsets = BSPX_FindLump(bspx, mod_base, "LMOFFSET", &size); overrides->offsets = BSPX_FindLump(bspx, mod_base, "LMOFFSET", &size);
if (size != loadmodel->numsurfaces * sizeof(int)) if (size != loadmodel->numsurfaces * sizeof(int))
{
if (size)
Con_Printf(CON_ERROR"BSPX LMOFFSET lump is wrong size, expected %u entries, found %u\n", loadmodel->numsurfaces, size/(unsigned int)sizeof(int));
overrides->offsets = NULL; overrides->offsets = NULL;
}
} }
if (!overrides->styles8 && !overrides->styles16) if (!overrides->styles8 && !overrides->styles16)
{ //16bit per-face lightmap styles index { //16bit per-face lightmap styles index
@ -2040,7 +2040,11 @@ void Mod_LoadLighting (model_t *loadmodel, bspx_header_t *bspx, qbyte *mod_base,
overrides->styles16 = BSPX_FindLump(bspx, mod_base, "LMSTYLE16", &size); overrides->styles16 = BSPX_FindLump(bspx, mod_base, "LMSTYLE16", &size);
overrides->stylesperface = size / (sizeof(*overrides->styles16)*loadmodel->numsurfaces); //rounding issues will be caught on the next line... overrides->stylesperface = size / (sizeof(*overrides->styles16)*loadmodel->numsurfaces); //rounding issues will be caught on the next line...
if (!overrides->stylesperface || size != loadmodel->numsurfaces * sizeof(*overrides->styles16)*overrides->stylesperface) if (!overrides->stylesperface || size != loadmodel->numsurfaces * sizeof(*overrides->styles16)*overrides->stylesperface)
{
if (size)
Con_Printf(CON_ERROR"BSPX LMSTYLE16 lump is wrong size, expected %u*%u entries, found %u\n", loadmodel->numsurfaces, overrides->stylesperface, size/(unsigned int)sizeof(*overrides->styles16));
overrides->styles16 = NULL; overrides->styles16 = NULL;
}
else if (overrides->stylesperface > MAXCPULIGHTMAPS) else if (overrides->stylesperface > MAXCPULIGHTMAPS)
Con_Printf(CON_WARNING "LMSTYLE16 lump provides %i styles, only the first %i will be used.\n", overrides->stylesperface, MAXCPULIGHTMAPS); Con_Printf(CON_WARNING "LMSTYLE16 lump provides %i styles, only the first %i will be used.\n", overrides->stylesperface, MAXCPULIGHTMAPS);
} }
@ -2050,10 +2054,27 @@ void Mod_LoadLighting (model_t *loadmodel, bspx_header_t *bspx, qbyte *mod_base,
overrides->styles8 = BSPX_FindLump(bspx, mod_base, "LMSTYLE", &size); overrides->styles8 = BSPX_FindLump(bspx, mod_base, "LMSTYLE", &size);
overrides->stylesperface = size / (sizeof(*overrides->styles8)*loadmodel->numsurfaces); //rounding issues will be caught on the next line... overrides->stylesperface = size / (sizeof(*overrides->styles8)*loadmodel->numsurfaces); //rounding issues will be caught on the next line...
if (!overrides->stylesperface || size != loadmodel->numsurfaces * sizeof(*overrides->styles8)*overrides->stylesperface) if (!overrides->stylesperface || size != loadmodel->numsurfaces * sizeof(*overrides->styles8)*overrides->stylesperface)
{
if (size)
Con_Printf(CON_ERROR"BSPX LMSTYLE16 lump is wrong size, expected %u*%u entries, found %u\n", loadmodel->numsurfaces, overrides->stylesperface, size/(unsigned int)sizeof(*overrides->styles8));
overrides->styles8 = NULL; overrides->styles8 = NULL;
}
else if (overrides->stylesperface > MAXCPULIGHTMAPS) else if (overrides->stylesperface > MAXCPULIGHTMAPS)
Con_Printf(CON_WARNING "LMSTYLE lump provides %i styles, only the first %i will be used.\n", overrides->stylesperface, MAXCPULIGHTMAPS); Con_Printf(CON_WARNING "LMSTYLE lump provides %i styles, only the first %i will be used.\n", overrides->stylesperface, MAXCPULIGHTMAPS);
} }
overrides->shifts = BSPX_FindLump(bspx, mod_base, "LMSHIFT", &size);
if (size != loadmodel->numsurfaces)
{
if (size)
{ //ericw-tools is screwing up again. don't leave things screwed.
Con_Printf(CON_ERROR"BSPX LMSHIFT lump is wrong size, expected %u entries, found %u\n", loadmodel->numsurfaces, size);
overrides->styles16 = NULL;
overrides->styles8 = NULL;
overrides->offsets = NULL;
}
overrides->shifts = NULL;
}
} }
if (luxdata && luxtmp) if (luxdata && luxtmp)