FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-12-26 02:36:08 +01:00
Code Issues 2 Projects Releases Wiki Activity

engine: fix loading map in Dark Future mod with broken mark surface id

Browse Source
This commit is contained in:
Alibek Omarov 2024-09-05 15:23:23 +03:00
parent 2eb8f88a20
commit 178602ea1f
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engine/common/mod_bmodel.c
View File

@ -2030,24 +2030,35 @@ static void Mod_LoadMarkSurfaces( model_t *mod, dbspmodel_t *bmod )
if( bmod->version == QBSP2_VERSION )
{
dmarkface32_t *in = bmod->markfaces32;
const dmarkface32_t *in = bmod->markfaces32;
for( i = 0; i < bmod->nummarkfaces; i++, in++ )
for( i = 0; i < bmod->nummarkfaces; i++ )
{
if( *in < 0 || *in >= mod->numsurfaces )
Host_Error( "%s: bad surface number in '%s'\n", __func__, mod->name );
out[i] = mod->surfaces + *in;
if( in[i] < 0 || in[i] >= mod->numsurfaces )
Host_Error( "%s: bad surface number %i at %i (max %i) in '%s'\n", __func__, in[i], i, mod->numsurfaces, mod->name );
out[i] = mod->surfaces + in[i];
}
}
else
{
dmarkface_t *in = bmod->markfaces;
const dmarkface_t *in = bmod->markfaces;
for( i = 0; i < bmod->nummarkfaces; i++, in++ )
for( i = 0; i < bmod->nummarkfaces; i++ )
{
if( *in < 0 || *in >= mod->numsurfaces )
Host_Error( "%s: bad surface number in '%s'\n", __func__, mod->name );
out[i] = mod->surfaces + *in;
// NOTE: some of the buggy compilers have written a broken BSP file
// with marksurface pointing at negative surface, for example darkf6.bsp
// and darkf26.bsp in darkfuture mod. GoldSrc straight up writes
// invalid pointer to a surface. Try to fix up these cases...
if( mod->numsurfaces <= INT16_MAX && (int16_t)in[i] < 0 )
{
Con_Printf( S_WARN "%s: fixing up bad surface number %i at %i (max %i) in '%s'\n", __func__, in[i], i, mod->numsurfaces, mod->name );
out[i] = mod->surfaces;
continue;
}
if( in[i] < 0 || in[i] >= mod->numsurfaces )
Host_Error( "%s: bad surface number %i at %i (max %i) in '%s'\n", __func__, in[i], i, mod->numsurfaces, mod->name );
out[i] = mod->surfaces + in[i];
}
}
}