Browse Source

engine: client: fix invalid playerinfo being accessed by renderer

pull/2/head
Alibek Omarov 2 years ago
parent
commit
314672d82c
  1. 15
      engine/client/cl_game.c
  2. 2
      engine/client/ref_common.c
  3. 1
      engine/common/common.h

15
engine/client/cl_game.c

@ -147,21 +147,6 @@ qboolean CL_IsThirdPerson( void )
return false; return false;
} }
/*
====================
CL_GetPlayerInfo
get player info by render request
====================
*/
player_info_t *CL_GetPlayerInfo( int playerIndex )
{
if( playerIndex < 0 || playerIndex >= cl.maxclients )
return NULL;
return &cl.players[playerIndex];
}
/* /*
==================== ====================
CL_CreatePlaylist CL_CreatePlaylist

2
engine/client/ref_common.c

@ -151,7 +151,7 @@ static player_info_t *pfnPlayerInfo( int index )
if( index == -1 ) // special index for menu if( index == -1 ) // special index for menu
return &gameui.playerinfo; return &gameui.playerinfo;
if( index < 0 || index > cl.maxclients ) if( index < 0 || index >= cl.maxclients )
return NULL; return NULL;
return &cl.players[index]; return &cl.players[index];

1
engine/common/common.h

@ -748,7 +748,6 @@ void R_ClearAllDecals( void );
void CL_ClearStaticEntities( void ); void CL_ClearStaticEntities( void );
qboolean S_StreamGetCurrentState( char *currentTrack, char *loopTrack, int *position ); qboolean S_StreamGetCurrentState( char *currentTrack, char *loopTrack, int *position );
struct cl_entity_s *CL_GetEntityByIndex( int index ); struct cl_entity_s *CL_GetEntityByIndex( int index );
struct player_info_s *CL_GetPlayerInfo( int playerIndex );
void CL_ServerCommand( qboolean reliable, const char *fmt, ... ) _format( 2 ); void CL_ServerCommand( qboolean reliable, const char *fmt, ... ) _format( 2 );
void CL_HudMessage( const char *pMessage ); void CL_HudMessage( const char *pMessage );
const char *CL_MsgInfo( int cmd ); const char *CL_MsgInfo( int cmd );

Loading…
Cancel
Save