diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-06-26 02:54:21 +0200 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-06-26 02:54:21 +0200 |
| commit | 7a9d256ea39e7ed8797801f8184e6ab7f27a21dc (patch) | |
| tree | 60717f0117b2b696693efa0e7070c58ea266cdcf /src/cgame/cg_players.c | |
| parent | b28d5f6dbedd5b895eed4cc5b730581df3b2215d (diff) | |
Bug fixes for Wraith.
Diffstat (limited to 'src/cgame/cg_players.c')
| -rw-r--r-- | src/cgame/cg_players.c | 12 |
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 |