YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-29 16:24:16 +00:00
Code Issues Projects Releases Wiki Activity

engine: common: hpak: fixed rest of bugs in HPAK_AddLump

Browse Source
This commit is contained in:
SNMetamorph 2022-11-26 05:34:05 +04:00 committed by Alibek Omarov
parent f377461fdf
commit 084fac3606
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/common/hpak.c
View File

@ -226,7 +226,7 @@ void HPAK_AddLump( qboolean bUseQueue, const char *name, resource_t *pResource,
memset( &ctx, 0, sizeof( MD5Context_t )); memset( &ctx, 0, sizeof( MD5Context_t ));
MD5Init( &ctx ); MD5Init( &ctx );
if( pData == NULL ) if( !pData )
{ {
byte *temp; byte *temp;
@ -327,9 +327,10 @@ void HPAK_AddLump( qboolean bUseQueue, const char *name, resource_t *pResource,
dstpak.entries = Z_Malloc( sizeof( hpak_lump_t ) * dstpak.count ); dstpak.entries = Z_Malloc( sizeof( hpak_lump_t ) * dstpak.count );
memcpy( dstpak.entries, srcpak.entries, sizeof( hpak_lump_t ) * srcpak.count ); memcpy( dstpak.entries, srcpak.entries, sizeof( hpak_lump_t ) * srcpak.count );
// check is there are entry with same hash
for( i = 0; i < srcpak.count; i++ ) for( i = 0; i < srcpak.count; i++ )
{ {
if( memcmp( md5, srcpak.entries[i].resource.rgucMD5_hash, 16 )) if( memcmp( md5, srcpak.entries[i].resource.rgucMD5_hash, 16 ) == 0 )
{ {
pCurrentEntry = &dstpak.entries[i]; pCurrentEntry = &dstpak.entries[i];
@ -347,8 +348,10 @@ void HPAK_AddLump( qboolean bUseQueue, const char *name, resource_t *pResource,
pCurrentEntry->filepos = FS_Tell( file_dst ); pCurrentEntry->filepos = FS_Tell( file_dst );
pCurrentEntry->disksize = pResource->nDownloadSize; pCurrentEntry->disksize = pResource->nDownloadSize;
if( !pData ) FS_FileCopy( file_dst, file_src, pCurrentEntry->disksize ); if( !pData )
else FS_Write( file_dst, pData, pCurrentEntry->disksize ); FS_FileCopy( file_dst, pFile, pCurrentEntry->disksize );
else
FS_Write( file_dst, pData, pCurrentEntry->disksize );
hash_pack_header.infotableofs = FS_Tell( file_dst ); hash_pack_header.infotableofs = FS_Tell( file_dst );
FS_Write( file_dst, &dstpak.count, sizeof( dstpak.count )); FS_Write( file_dst, &dstpak.count, sizeof( dstpak.count ));