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

engine: client: simplify CL_EDICT_NUM and it's sister, non throwing error, function CL_GetEntityByIndex

Browse source
This commit is contained in:
Alibek Omarov 2025-02-23 01:51:05 +03:00
parent f7aa8a0c90
commit bda4c45504
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
engine/client/client.h
View file

@ -844,19 +844,21 @@ void CL_EnableScissor( scissor_state_t *scissor, int x, int y, int width, int he
void CL_DisableScissor( scissor_state_t *scissor ); void CL_DisableScissor( scissor_state_t *scissor );
qboolean CL_Scissor( const scissor_state_t *scissor, float *x, float *y, float *width, float *height, float *u0, float *v0, float *u1, float *v1 ); qboolean CL_Scissor( const scissor_state_t *scissor, float *x, float *y, float *width, float *height, float *u0, float *v0, float *u1, float *v1 );
static inline cl_entity_t *CL_EDICT_NUM( int n ) static inline cl_entity_t *CL_EDICT_NUM( int index )
{ {
if( !clgame.entities ) if( !clgame.entities ) // not in game yet
{ {
Host_Error( "%s: clgame.entities is NULL\n", __func__ ); Host_Error( "%s: clgame.entities is NULL\n", __func__ );
return NULL; return NULL;
} }
if(( n >= 0 ) && ( n < clgame.maxEntities )) if( index < 0 || index >= clgame.maxEntities )
return clgame.entities + n; {
Host_Error( "%s: bad number %i\n", __func__, index );
Host_Error( "%s: bad number %i\n", __func__, n );
return NULL; return NULL;
}
return clgame.entities + index;
} }
static inline cl_entity_t *CL_GetEntityByIndex( int index ) static inline cl_entity_t *CL_GetEntityByIndex( int index )
@ -867,10 +869,7 @@ static inline cl_entity_t *CL_GetEntityByIndex( int index )
if( index < 0 || index >= clgame.maxEntities ) if( index < 0 || index >= clgame.maxEntities )
return NULL; return NULL;
if( index == 0 ) return clgame.entities + index;
return clgame.entities;
return CL_EDICT_NUM( index );
} }
static inline model_t *CL_ModelHandle( int modelindex ) static inline model_t *CL_ModelHandle( int modelindex )
@ -880,7 +879,7 @@ static inline model_t *CL_ModelHandle( int modelindex )
static inline qboolean CL_IsThirdPerson( void ) static inline qboolean CL_IsThirdPerson( void )
{ {
return clgame.dllFuncs.CL_IsThirdPerson() ? true : false; return clgame.dllFuncs.CL_IsThirdPerson();
} }
static inline cl_entity_t *CL_GetLocalPlayer( void ) static inline cl_entity_t *CL_GetLocalPlayer( void )