From 4ada40e8a8aaebeb7d06dc55956a161e1673a1b9 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 15 Mar 2023 06:28:20 +0300 Subject: [PATCH] engine: client: check if we should discard local player entity before HUD_AddEntity call, allowing CL_IsThirdPerson hack used in MMod --- engine/client/cl_frame.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/engine/client/cl_frame.c b/engine/client/cl_frame.c index 81976384..6aad7424 100644 --- a/engine/client/cl_frame.c +++ b/engine/client/cl_frame.c @@ -973,15 +973,6 @@ qboolean CL_AddVisibleEntity( cl_entity_t *ent, int entityType ) if( !ent || !ent->model ) return false; - // check for adding this entity - if( !clgame.dllFuncs.pfnAddEntity( entityType, ent, ent->model->name )) - { - // local player was reject by game code, so ignore any effects - if( RP_LOCALCLIENT( ent )) - cl.local.apply_effects = false; - return false; - } - // don't add the player in firstperson mode if( RP_LOCALCLIENT( ent )) { @@ -991,6 +982,15 @@ qboolean CL_AddVisibleEntity( cl_entity_t *ent, int entityType ) return false; } + // check for adding this entity + if( !clgame.dllFuncs.pfnAddEntity( entityType, ent, ent->model->name )) + { + // local player was reject by game code, so ignore any effects + if( RP_LOCALCLIENT( ent )) + cl.local.apply_effects = false; + return false; + } + if( entityType == ET_BEAM ) { ref.dllFuncs.CL_AddCustomBeam( ent );