RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: move CRC32_MapFIle to mod_bmodel, as it's a common function. Use le_struct_swap

Browse Source
This commit is contained in:
Alibek Omarov
2026-04-22 20:10:35 +05:00
committed by a1batross
parent 86c84c7de7
commit f9ed578bf1
2 changed files with 81 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
engine/common/mod_bmodel.c
View File

@@ -4067,6 +4067,87 @@ static void Mod_SwapBSPLumps( byte *mod_base, size_t bufferlen )
}
}
/*
=================
CRC32_MapFile
compute CRC for the map lump data
=================
*/
qboolean CRC32_MapFile( dword *crcvalue, const char *filename, qboolean multiplayer )
{
byte headbuf[sizeof( dheader_t )];
char buffer[1024];
int i, num_bytes, lumplen;
dheader_t *header;
file_t *f;
if( !crcvalue )
return false;
// always calc same checksum for singleplayer
if( multiplayer == false )
{
*crcvalue = (('H'<<24)+('S'<<16)+('A'<<8)+'X');
return true;
}
f = FS_Open( filename, "rb", false );
if( !f )
return false;
num_bytes = FS_Read( f, headbuf, sizeof( headbuf ));
if( num_bytes != sizeof( headbuf ))
{
FS_Close( f );
return false;
}
header = (dheader_t *)headbuf;
le_struct_swap( dheader_swap, header );
switch( header->version )
{
case Q1BSP_VERSION:
case HLBSP_VERSION:
case QBSP2_VERSION:
break;
default:
FS_Close( f );
return false;
}
CRC32_Init( crcvalue );
for( i = LUMP_PLANES; i < HEADER_LUMPS; i++ )
{
lumplen = header->lumps[i].filelen;
FS_Seek( f, header->lumps[i].fileofs, SEEK_SET );
while( lumplen > 0 )
{
if( lumplen >= sizeof( buffer ))
num_bytes = FS_Read( f, buffer, sizeof( buffer ));
else
num_bytes = FS_Read( f, buffer, lumplen );
if( num_bytes > 0 )
{
lumplen -= num_bytes;
CRC32_ProcessBuffer( crcvalue, buffer, num_bytes );
}
if( FS_Eof( f ))
break;
}
}
FS_Close( f );
return true;
}
/*
=================
Mod_FindEndOfBSPFile

76
engine/server/sv_init.c
View File

@@ -833,82 +833,6 @@ static void SV_SetupClients( void )
ClearBits( sv_maxclients.flags, FCVAR_CHANGED );
}
qboolean CRC32_MapFile( dword *crcvalue, const char *filename, qboolean multiplayer )
{
char headbuf[1024], buffer[1024];
int i, num_bytes, lumplen;
int version, hdr_size;
dheader_t *header;
file_t *f;
if( !crcvalue ) return false;
// always calc same checksum for singleplayer
if( multiplayer == false )
{
*crcvalue = (('H'<<24)+('S'<<16)+('A'<<8)+'X');
return true;
}
f = FS_Open( filename, "rb", false );
if( !f ) return false;
// read version number
FS_Read( f, &version, sizeof( int ));
FS_Seek( f, 0, SEEK_SET );
hdr_size = sizeof( int ) + sizeof( dlump_t ) * HEADER_LUMPS;
num_bytes = FS_Read( f, headbuf, hdr_size );
// corrupted map ?
if( num_bytes != hdr_size )
{
FS_Close( f );
return false;
}
header = (dheader_t *)headbuf;
// invalid version ?
switch( header->version )
{
case Q1BSP_VERSION:
case HLBSP_VERSION:
case QBSP2_VERSION:
break;
default:
FS_Close( f );
return false;
}
CRC32_Init( crcvalue );
for( i = LUMP_PLANES; i < HEADER_LUMPS; i++ )
{
lumplen = header->lumps[i].filelen;
FS_Seek( f, header->lumps[i].fileofs, SEEK_SET );
while( lumplen > 0 )
{
if( lumplen >= sizeof( buffer ))
num_bytes = FS_Read( f, buffer, sizeof( buffer ));
else num_bytes = FS_Read( f, buffer, lumplen );
if( num_bytes > 0 )
{
lumplen -= num_bytes;
CRC32_ProcessBuffer( crcvalue, buffer, num_bytes );
}
// file unexpected end ?
if( FS_Eof( f )) break;
}
}
FS_Close( f );
return 1;
}
void SV_FreeTestPacket( void )
{