From 192d510924609945e97d680f7e3a3ada9b8e079c Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 3 Apr 2023 03:51:12 +0300 Subject: [PATCH] engine: client: remove unused function CL_FreeEntity and everything that used it --- engine/client/cl_efrag.c | 40 -------------------------------------- engine/client/cl_game.c | 7 ------- engine/client/client.h | 2 -- engine/client/ref_common.c | 10 ---------- 4 files changed, 59 deletions(-) diff --git a/engine/client/cl_efrag.c b/engine/client/cl_efrag.c index 366134a2..668c12da 100644 --- a/engine/client/cl_efrag.c +++ b/engine/client/cl_efrag.c @@ -33,46 +33,6 @@ static mnode_t *r_pefragtopnode; static vec3_t r_emins, r_emaxs; static cl_entity_t *r_addent; -/* -================ -R_RemoveEfrags - -Call when removing an object from the world or moving it to another position -================ -*/ -void R_RemoveEfrags( cl_entity_t *ent ) -{ - efrag_t *ef, *old, *walk, **prev; - - ef = ent->efrag; - - while( ef ) - { - prev = &ef->leaf->efrags; - while( 1 ) - { - walk = *prev; - if( !walk ) break; - - if( walk == ef ) - { - // remove this fragment - *prev = ef->leafnext; - break; - } - else prev = &walk->leafnext; - } - - old = ef; - ef = ef->entnext; - - // put it on the free list - old->entnext = clgame.free_efrags; - clgame.free_efrags = old; - } - ent->efrag = NULL; -} - /* =================== R_SplitEntityOnNode diff --git a/engine/client/cl_game.c b/engine/client/cl_game.c index 358c2738..2471efc4 100644 --- a/engine/client/cl_game.c +++ b/engine/client/cl_game.c @@ -1064,13 +1064,6 @@ void CL_LinkUserMessage( char *pszName, const int svc_num, int iSize ) CL_ClearUserMessage( pszName, svc_num ); } -void CL_FreeEntity( cl_entity_t *pEdict ) -{ - Assert( pEdict != NULL ); - R_RemoveEfrags( pEdict ); - CL_KillDeadBeams( pEdict ); -} - void CL_ClearWorld( void ) { cl_entity_t *worldmodel; diff --git a/engine/client/client.h b/engine/client/client.h index 32bb57d4..f07a78db 100644 --- a/engine/client/client.h +++ b/engine/client/client.h @@ -835,7 +835,6 @@ void CL_FreeEdicts( void ); void CL_ClearWorld( void ); void CL_DrawCenterPrint( void ); void CL_ClearSpriteTextures( void ); -void CL_FreeEntity( cl_entity_t *pEdict ); void CL_CenterPrint( const char *text, float y ); void CL_TextMessageParse( byte *pMemFile, int fileSize ); client_textmessage_t *CL_TextMessageGet( const char *pName ); @@ -1002,7 +1001,6 @@ const ref_overview_t *GL_GetOverviewParms( void ); // void R_StoreEfrags( efrag_t **ppefrag, int framecount ); void R_AddEfrags( cl_entity_t *ent ); -void R_RemoveEfrags( cl_entity_t *ent ); // // cl_tent.c // diff --git a/engine/client/ref_common.c b/engine/client/ref_common.c index 732f2a3a..81e6dd1d 100644 --- a/engine/client/ref_common.c +++ b/engine/client/ref_common.c @@ -74,16 +74,6 @@ static void pfnStudioEvent( const mstudioevent_t *event, const cl_entity_t *e ) clgame.dllFuncs.pfnStudioEvent( event, e ); } -static efrag_t* pfnGetEfragsFreeList( void ) -{ - return clgame.free_efrags; -} - -static void pfnSetEfragsFreeList( efrag_t *list ) -{ - clgame.free_efrags = list; -} - static model_t *pfnGetDefaultSprite( enum ref_defaultsprite_e spr ) { switch( spr )