Merge branch 'master' into bshift

FWGS · Sep 19, 2023 · 77145f9 · 77145f9
2 parents 818632f + 04e5644
commit 77145f9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 596 deletions.
diff --git a/cl_dll/neon_mathfun.h b/cl_dll/neon_mathfun.h
diff --git a/cl_dll/saytext.cpp b/cl_dll/saytext.cpp
@@ -100,10 +100,11 @@ int CHudSayText::Draw( float flTime )
 	int y = Y_START;
 
 #if USE_VGUI
-	if( ( gViewPort && gViewPort->AllowedToPrintText() == FALSE ) || !m_HUD_saytext->value )
+	if( ( gViewPort && gViewPort->AllowedToPrintText() == FALSE ) )
 		return 1;
 #endif
-
+	if ( !m_HUD_saytext->value )
+		return 1;
 
 	// make sure the scrolltime is within reasonable bounds,  to guard against the clock being reset
 	flScrollTime = Q_min( flScrollTime, flTime + m_HUD_saytext_time->value );
@@ -173,8 +174,6 @@ void CHudSayText::SayTextPrint( const char *pszBuf, int iBufSize, int clientInde
 		ConsolePrint( pszBuf );
 		return;
 	}
-#else
-	ConsolePrint( pszBuf );
 #endif
 
 	int i;