summaryrefslogtreecommitdiff
path: root/src/cgame/cg_players.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame/cg_players.c')
-rw-r--r--src/cgame/cg_players.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index e0bb622..8da8757 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -1897,6 +1897,13 @@ void CG_Player( centity_t *cent )
if( es->eFlags & EF_NODRAW )
return;
+ if( ( es->eFlags & EF_WARPING ) &&
+ ( cgs.clientinfo[ es->number ].team != cg.snap->ps.stats[ STAT_TEAM ] ||
+ cg.snap->ps.stats[ STAT_TEAM ] == TEAM_NONE ) )
+ {
+ return;
+ }
+
// get the player model information
renderfx = 0;
if( es->number == cg.snap->ps.clientNum )
@@ -2060,6 +2067,11 @@ void CG_Player( centity_t *cent )
VectorCopy( legs.origin, legs.lightingOrigin );
VectorCopy( legs.origin, legs.oldorigin ); // don't positionally lerp at all
+ if( es->eFlags & EF_WARPING )
+ {
+ legs.customShader = cgs.media.warpingShader;
+ }
+
trap_R_AddRefEntityToScene( &legs );
// if the model failed, allow the default nullmodel to be displayed