From 537237ef62c9e4584e54d39ed143ad4a118ed225 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 28 Dec 2023 22:19:36 +0300 Subject: [PATCH] ref: gl: remove usage of PARM_VIEWENT_INDEX and PARM_PLAYER_INDEX --- ref/gl/gl_beams.c | 2 +- ref/gl/gl_local.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ref/gl/gl_beams.c b/ref/gl/gl_beams.c index 1ec35e24..17cffbe7 100644 --- a/ref/gl/gl_beams.c +++ b/ref/gl/gl_beams.c @@ -867,7 +867,7 @@ static qboolean R_BeamComputePoint( int beamEnt, vec3_t pt ) // get attachment if( attach > 0 ) VectorCopy( ent->attachment[attach - 1], pt ); - else if( ent->index == ENGINE_GET_PARM( PARM_PLAYER_INDEX ) ) + else if( ent->index == ( gp_cl->playernum + 1 )) { vec3_t simorg; gEngfuncs.GetPredictedOrigin( simorg ); diff --git a/ref/gl/gl_local.h b/ref/gl/gl_local.h index 4bc028b8..315312a2 100644 --- a/ref/gl/gl_local.h +++ b/ref/gl/gl_local.h @@ -87,10 +87,10 @@ extern poolhandle_t r_temppool; #define RP_NONVIEWERREF (RP_ENVVIEW) #define R_ModelOpaque( rm ) ( rm == kRenderNormal ) #define R_StaticEntity( ent ) ( VectorIsNull( ent->origin ) && VectorIsNull( ent->angles )) -#define RP_LOCALCLIENT( e ) ((e) != NULL && (e)->index == ENGINE_GET_PARM( PARM_PLAYER_INDEX ) && e->player ) +#define RP_LOCALCLIENT( e ) ((e) != NULL && (e)->index == ( gp_cl->playernum + 1 ) && e->player ) #define RP_NORMALPASS() ( FBitSet( RI.params, RP_NONVIEWERREF ) == 0 ) -#define CL_IsViewEntityLocalPlayer() ( ENGINE_GET_PARM( PARM_VIEWENT_INDEX ) == ENGINE_GET_PARM( PARM_PLAYER_INDEX ) ) +#define CL_IsViewEntityLocalPlayer() ( gp_cl->viewentity == ( gp_cl->playernum + 1 )) #define CULL_VISIBLE 0 // not culled #define CULL_BACKSIDE 1 // backside of transparent wall