From 0d8dceea4310fde5706b3ce1c70609d72a38efdf Mon Sep 17 00:00:00 2001 From: John Schoenick Date: Wed, 9 Sep 2015 18:35:41 -0700 Subject: Updated the SDK with the latest code from the TF and HL2 branches. --- mp/src/game/server/nav_file.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'mp/src/game/server/nav_file.cpp') diff --git a/mp/src/game/server/nav_file.cpp b/mp/src/game/server/nav_file.cpp index 7de114ec..ea3bf5ad 100644 --- a/mp/src/game/server/nav_file.cpp +++ b/mp/src/game/server/nav_file.cpp @@ -1318,12 +1318,11 @@ const CUtlVector< Place > *CNavMesh::GetPlacesFromNavFile( bool *hasUnnamedPlace if ( IsX360() ) { // 360 has compressed NAVs - CLZMA lzma; - if ( lzma.IsCompressed( (unsigned char *)fileBuffer.Base() ) ) + if ( CLZMA::IsCompressed( (unsigned char *)fileBuffer.Base() ) ) { - int originalSize = lzma.GetActualSize( (unsigned char *)fileBuffer.Base() ); + int originalSize = CLZMA::GetActualSize( (unsigned char *)fileBuffer.Base() ); unsigned char *pOriginalData = new unsigned char[originalSize]; - lzma.Uncompress( (unsigned char *)fileBuffer.Base(), pOriginalData ); + CLZMA::Uncompress( (unsigned char *)fileBuffer.Base(), pOriginalData ); fileBuffer.AssumeMemory( pOriginalData, originalSize, originalSize, CUtlBuffer::READ_ONLY ); } } @@ -1411,12 +1410,11 @@ NavErrorType CNavMesh::Load( void ) if ( IsX360() ) { // 360 has compressed NAVs - CLZMA lzma; - if ( lzma.IsCompressed( (unsigned char *)fileBuffer.Base() ) ) + if ( CLZMA::IsCompressed( (unsigned char *)fileBuffer.Base() ) ) { - int originalSize = lzma.GetActualSize( (unsigned char *)fileBuffer.Base() ); + int originalSize = CLZMA::GetActualSize( (unsigned char *)fileBuffer.Base() ); unsigned char *pOriginalData = new unsigned char[originalSize]; - lzma.Uncompress( (unsigned char *)fileBuffer.Base(), pOriginalData ); + CLZMA::Uncompress( (unsigned char *)fileBuffer.Base(), pOriginalData ); fileBuffer.AssumeMemory( pOriginalData, originalSize, originalSize, CUtlBuffer::READ_ONLY ); } } -- cgit v1.2.3