diff --git a/engine/client/cl_frame.c b/engine/client/cl_frame.c
index 625f193d..d2ef6f06 100644
--- a/engine/client/cl_frame.c
+++ b/engine/client/cl_frame.c
@@ -33,10 +33,12 @@ CL_IsPlayerIndex
 detect player entity
 ==================
 */
+#if XASH_EXT_OPT != 2
 qboolean CL_IsPlayerIndex( int idx )
 {
 	return ( idx >= 1 && idx <= cl.maxclients );
 }
+#endif
 
 /*
 =========================================================================
diff --git a/engine/client/client.h b/engine/client/client.h
index 36d3d1bf..25bea5de 100644
--- a/engine/client/client.h
+++ b/engine/client/client.h
@@ -954,7 +954,11 @@ void CL_ProcessPlayerState( int playerindex, entity_state_t *state );
 void CL_ComputePlayerOrigin( cl_entity_t *clent );
 void CL_ProcessPacket( frame_t *frame );
 void CL_MoveThirdpersonCamera( void );
+#if XASH_EXT_OPT == 2
+#define CL_IsPlayerIndex( idx ) (( idx ) >= 1 && ( idx ) <= cl.maxclients )
+#else
 qboolean CL_IsPlayerIndex( int idx );
+#endif
 void CL_SetIdealPitch( void );
 void CL_EmitEntities( void );