vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: mod_bmodel: rewrite .lit file loader using normal stream io functions

Browse source
This commit is contained in:
Alibek Omarov 2025-01-08 09:21:38 +03:00
parent baa8fbaaec
commit 98ff33d9e2
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
engine/common/mod_bmodel.c
View file

@ -1780,7 +1780,8 @@ static qboolean Mod_LoadLitfile( model_t *mod, const char *ext, size_t expected_
char modelname[64], path[64]; char modelname[64], path[64];
int iCompare; int iCompare;
fs_offset_t datasize; fs_offset_t datasize;
byte *in; file_t *f;
uint hdr[2];
COM_FileBase( mod->name, modelname, sizeof( modelname )); COM_FileBase( mod->name, modelname, sizeof( modelname ));
Q_snprintf( path, sizeof( path ), "maps/%s.%s", modelname, ext ); Q_snprintf( path, sizeof( path ), "maps/%s.%s", modelname, ext );
@ -1791,31 +1792,15 @@ static qboolean Mod_LoadLitfile( model_t *mod, const char *ext, size_t expected_
if( iCompare < 0 ) // this may happens if level-designer used -onlyents key for hlcsg if( iCompare < 0 ) // this may happens if level-designer used -onlyents key for hlcsg
Con_Printf( S_WARN "%s probably is out of date\n", path ); Con_Printf( S_WARN "%s probably is out of date\n", path );
in = FS_LoadFile( path, &datasize, false ); f = FS_Open( path, "rb", false );
if( !in ) if( !f )
{ {
Con_Printf( S_ERROR "couldn't load %s\n", path ); Con_Printf( S_ERROR "couldn't load %s\n", path );
return false; return false;
} }
if( datasize <= 8 ) // header + version datasize = FS_FileLength( f );
{
Con_Printf( S_ERROR "%s is too short\n", path );
goto cleanup_and_error;
}
if( LittleLong( ((uint *)in)[0] ) != IDDELUXEMAPHEADER )
{
Con_Printf( S_ERROR "%s is corrupted\n", path );
goto cleanup_and_error;
}
if( LittleLong( ((uint *)in)[1] ) != DELUXEMAP_VERSION )
{
Con_Printf( S_ERROR "has %s mismatched version (%u should be %u)\n", path, LittleLong( ((uint *)in)[1] ), DELUXEMAP_VERSION );
goto cleanup_and_error;
}
// skip header bytes // skip header bytes
datasize -= 8; datasize -= 8;
@ -1826,14 +1811,33 @@ static qboolean Mod_LoadLitfile( model_t *mod, const char *ext, size_t expected_
goto cleanup_and_error; goto cleanup_and_error;
} }
if( FS_Read( f, hdr, sizeof( hdr )) != sizeof( hdr ))
{
Con_Printf( S_ERROR "failed reading header from %s\n", path );
goto cleanup_and_error;
}
if( LittleLong( hdr[0] ) != IDDELUXEMAPHEADER )
{
Con_Printf( S_ERROR "%s is corrupted\n", path );
goto cleanup_and_error;
}
if( LittleLong( hdr[1] ) != DELUXEMAP_VERSION )
{
Con_Printf( S_ERROR "has %s mismatched version (%u should be %u)\n", path, LittleLong( hdr[1] ), DELUXEMAP_VERSION );
goto cleanup_and_error;
}
*out = Mem_Malloc( mod->mempool, datasize ); *out = Mem_Malloc( mod->mempool, datasize );
memcpy( *out, in + 8, datasize );
*outsize = datasize; *outsize = datasize;
Mem_Free( in );
FS_Read( f, *out, datasize );
FS_Close( f );
return true; return true;
cleanup_and_error: cleanup_and_error:
Mem_Free( in ); FS_Close( f );
return false; return false;
} }