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

engine: add file size argument to sprite model loader

Browse Source
This commit is contained in:
Alibek Omarov
2025-10-31 15:40:58 +05:00
parent 9bb9575c6d
commit b3dc772cd2
4 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/cl_game.c
View File

@@ -1281,7 +1281,7 @@ static qboolean CL_LoadHudSprite( const char *szSpriteName, model_t *m_pSprite,
Mod_LoadMapSprite( m_pSprite, buf, size, &loaded );
else
{
Mod_LoadSpriteModel( m_pSprite, buf, &loaded );
Mod_LoadSpriteModel( m_pSprite, buf, size, &loaded );
ref.dllFuncs.Mod_ProcessRenderData( m_pSprite, true, buf );
}

2
engine/common/mod_local.h
View File

@@ -207,7 +207,7 @@ void Mod_ClearStudioCache( void );
//
// mod_sprite.c
//
void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded );
void Mod_LoadSpriteModel( model_t *mod, const void *buffer, size_t buffersize, qboolean *loaded );
#endif
#endif//MOD_LOCAL_H

85
engine/common/mod_sprite.c
View File

@@ -30,63 +30,98 @@ Mod_LoadSpriteModel
load sprite model
====================
*/
void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded )
void Mod_LoadSpriteModel( model_t *mod, const void *buffer, size_t buffersize, qboolean *loaded )
{
dsprite_q1_t *pinq1;
dsprite_hl_t *pinhl;
dsprite_t *pin;
msprite_t *psprite;
char poolname[MAX_VA_STRING];
int i, size;
const dsprite_t *pin = buffer;
msprite_t *psprite;
char poolname[MAX_VA_STRING];
if( loaded ) *loaded = false;
pin = (dsprite_t *)buffer;
mod->type = mod_sprite;
i = pin->version;
if( loaded )
*loaded = false;
if( buffersize < sizeof( dsprite_t ))
{
Con_DPrintf( S_ERROR "%s: %s have incorrect file size %zu should be greater than %zu (%s)\n", __func__, mod->name, buffersize, sizeof( dsprite_t ), "basic header" );
return;
}
if( pin->ident != IDSPRITEHEADER )
{
Con_DPrintf( S_ERROR "%s has wrong id (%x should be %x)\n", mod->name, pin->ident, IDSPRITEHEADER );
Con_DPrintf( S_ERROR "%s: %s has wrong id (0x%x should be 0x%x)\n", __func__, mod->name, pin->ident, IDSPRITEHEADER );
return;
}
if( i != SPRITE_VERSION_Q1 && i != SPRITE_VERSION_HL && i != SPRITE_VERSION_32 )
switch( pin->version )
{
Con_DPrintf( S_ERROR "%s has wrong version number (%i should be %i or %i)\n", mod->name, i, SPRITE_VERSION_Q1, SPRITE_VERSION_HL );
case SPRITE_VERSION_Q1:
case SPRITE_VERSION_32:
if( buffersize < sizeof( dsprite_q1_t ))
{
Con_DPrintf( S_ERROR "%s: %s have incorrect file size %zu should be greater than %zu (%s)\n", __func__, mod->name, buffersize, sizeof( dsprite_q1_t ), "q1 header" );
return;
}
break;
case SPRITE_VERSION_HL:
if( buffersize < sizeof( dsprite_hl_t ))
{
Con_DPrintf( S_ERROR "%s: %s have incorrect file size %zu should be greater than %zu (%s)\n", __func__, mod->name, buffersize, sizeof( dsprite_hl_t ), "hl header" );
return;
}
break;
default:
Con_DPrintf( S_ERROR "%s: %s has wrong version number (%i should be %i, %i or %i)\n", __func__, mod->name, pin->version, SPRITE_VERSION_Q1, SPRITE_VERSION_32, SPRITE_VERSION_HL );
return;
}
mod->type = mod_sprite;
Q_snprintf( poolname, sizeof( poolname ), "^2%s^7", mod->name );
mod->mempool = Mem_AllocPool( poolname );
if( i == SPRITE_VERSION_Q1 || i == SPRITE_VERSION_32 )
if( pin->version == SPRITE_VERSION_Q1 || pin->version == SPRITE_VERSION_32 )
{
pinq1 = (dsprite_q1_t *)buffer;
const dsprite_q1_t *pinq1 = buffer;
size_t size;
if( pinq1->numframes == 0 )
{
Con_DPrintf( S_ERROR "%s: %s has no frames\n", __func__, mod->name );
return;
}
size = sizeof( msprite_t ) + ( pinq1->numframes - 1 ) * sizeof( psprite->frames );
psprite = Mem_Calloc( mod->mempool, size );
mod->cache.data = psprite; // make link to extradata
psprite->type = pinq1->type;
psprite->texFormat = SPR_ADDITIVE; //SPR_ALPHTEST;
psprite->texFormat = SPR_ADDITIVE;
psprite->numframes = mod->numframes = pinq1->numframes;
psprite->facecull = SPR_CULL_FRONT;
psprite->radius = pinq1->boundingradius;
psprite->synctype = pinq1->synctype;
// LordHavoc: hack to allow sprites to be non-fullbright
for( i = 0; i < MAX_QPATH && mod->name[i]; i++ )
if( mod->name[i] == '!' )
psprite->texFormat = SPR_ALPHTEST;
// LadyHavoc: hack to allow sprites to be non-fullbright
if( Q_strchr( mod->name, '!' ))
psprite->texFormat = SPR_ALPHTEST;
mod->mins[0] = mod->mins[1] = -pinq1->bounds[0] * 0.5f;
mod->maxs[0] = mod->maxs[1] = pinq1->bounds[0] * 0.5f;
mod->mins[2] = -pinq1->bounds[1] * 0.5f;
mod->maxs[2] = pinq1->bounds[1] * 0.5f;
}
else // if( i == SPRITE_VERSION_HL )
else // if( pin->version == SPRITE_VERSION_HL )
{
pinhl = (dsprite_hl_t *)buffer;
const dsprite_hl_t *pinhl = buffer;
size_t size;
if( pinhl->numframes == 0 )
{
Con_DPrintf( S_WARN "%s: %s has no frames\n", __func__, mod->name );
return;
}
size = sizeof( msprite_t ) + ( pinhl->numframes - 1 ) * sizeof( psprite->frames );
psprite = Mem_Calloc( mod->mempool, size );
mod->cache.data = psprite; // make link to extradata
@@ -102,7 +137,9 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded )
mod->mins[2] = -pinhl->bounds[1] * 0.5f;
mod->maxs[2] = pinhl->bounds[1] * 0.5f;
}
if( loaded ) *loaded = true; // done
if( loaded )
*loaded = true; // done
if( Host_IsDedicated() )
{

2
engine/common/model.c
View File

@@ -300,7 +300,7 @@ model_t *Mod_LoadModel( model_t *mod, qboolean crash )
Mod_LoadStudioModel( mod, buf, &loaded );
break;
case IDSPRITEHEADER:
Mod_LoadSpriteModel( mod, buf, &loaded );
Mod_LoadSpriteModel( mod, buf, length, &loaded );
break;
case IDALIASHEADER:
Mod_LoadAliasModel( mod, buf, &loaded );