diff --git a/ref/soft/r_beams.c b/ref/soft/r_beams.c
index 01224b18..b9517520 100644
--- a/ref/soft/r_beams.c
+++ b/ref/soft/r_beams.c
@@ -880,7 +880,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/soft/r_local.h b/ref/soft/r_local.h
index 8eddc8f4..3a5dbcd2 100644
--- a/ref/soft/r_local.h
+++ b/ref/soft/r_local.h
@@ -78,10 +78,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 == gEngfuncs.GetPlayerIndex() && 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