aboutsummaryrefslogtreecommitdiff
path: root/mp/src/game/server/nav_file.cpp
diff options
context:
space:
mode:
authorJohn Schoenick <[email protected]>2015-09-09 18:35:41 -0700
committerJohn Schoenick <[email protected]>2015-09-09 18:35:41 -0700
commit0d8dceea4310fde5706b3ce1c70609d72a38efdf (patch)
treec831ef32c2c801a5c5a80401736b52c7b5a528ec /mp/src/game/server/nav_file.cpp
parentUpdated the SDK with the latest code from the TF and HL2 branches. (diff)
downloadsource-sdk-2013-master.tar.xz
source-sdk-2013-master.zip
Updated the SDK with the latest code from the TF and HL2 branches.HEADmaster
Diffstat (limited to 'mp/src/game/server/nav_file.cpp')
-rw-r--r--mp/src/game/server/nav_file.cpp14
1 files changed, 6 insertions, 8 deletions
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 );
}
}