From ca3544d55949f9c7e73cc24ed29e7afe5748ffbe Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 18 Dec 2021 03:32:40 +0300 Subject: [PATCH] engine: server: don't assert for NULL player in FatPAS/PVS if we don't need it --- engine/server/sv_game.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/server/sv_game.c b/engine/server/sv_game.c index 494f1262..0f9239f0 100644 --- a/engine/server/sv_game.c +++ b/engine/server/sv_game.c @@ -4150,13 +4150,13 @@ byte *pfnSetFatPVS( const float *org ) if( !sv.worldmodel->visdata || sv_novis->value || !org || CL_DisableVisibility( )) fullvis = true; - ASSERT( pfnGetCurrentPlayer() != -1 ); - // portals can't change viewpoint! if( !FBitSet( sv.hostflags, SVF_MERGE_VISIBILITY )) { vec3_t viewPos, offset; + ASSERT( pfnGetCurrentPlayer() != -1 ); + // see code from client.cpp for understanding: // org = pView->v.origin + pView->v.view_ofs; // if ( pView->v.flags & FL_DUCKING ) @@ -4200,13 +4200,13 @@ byte *pfnSetFatPAS( const float *org ) if( !sv.worldmodel->visdata || sv_novis->value || !org || CL_DisableVisibility( )) fullvis = true; - ASSERT( pfnGetCurrentPlayer() != -1 ); - // portals can't change viewpoint! if( !FBitSet( sv.hostflags, SVF_MERGE_VISIBILITY )) { vec3_t viewPos, offset; + ASSERT( pfnGetCurrentPlayer() != -1 ); + // see code from client.cpp for understanding: // org = pView->v.origin + pView->v.view_ofs; // if ( pView->v.flags & FL_DUCKING )