Updated the SDK with the latest code from the TF and HL2 branches.

This commit is contained in:
John Schoenick
2015-09-09 18:35:41 -07:00
parent 55ed12f8d1
commit 0d8dceea43
675 changed files with 46223 additions and 9824 deletions
+3 -3
View File
@@ -219,7 +219,7 @@ void C_SceneEntity::SetupClientOnlyScene( const char *pszFilename, C_BaseFlex *p
{
LoadSceneFromFile( szFilename );
if (!CommandLine()->FindParm("-hushasserts"))
if ( !HushAsserts() )
{
Assert( m_pScene );
}
@@ -257,7 +257,7 @@ void C_SceneEntity::SetupClientOnlyScene( const char *pszFilename, C_BaseFlex *p
if ( m_hOwner.Get() )
{
if (!CommandLine()->FindParm("-hushasserts"))
if ( !HushAsserts() )
{
Assert( m_pScene );
}
@@ -1108,7 +1108,7 @@ void C_SceneEntity::SetCurrentTime( float t, bool forceClientSync )
//-----------------------------------------------------------------------------
void C_SceneEntity::PrefetchAnimBlocks( CChoreoScene *pScene )
{
if (!CommandLine()->FindParm("-hushasserts"))
if ( !HushAsserts() )
{
Assert( pScene && m_bMultiplayer );
}