From 53e78c503e6e9c7d15e2eefc480755fe37dd7077 Mon Sep 17 00:00:00 2001 From: Joe Ludwig Date: Thu, 15 May 2014 13:59:18 -0700 Subject: General: * Upgraded Steamworks SDK to v1.29 * Fixed mod compatibility problem with Multiplayer Base that was introduced in September. * In Hammer, while using the Vertex Tool, pressing CTRL+B will snap selected vertices to the grid. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Virtual Reality: * Mods that support virtual reality now need to have a line in gameinfo.txt that says “supportsvr 1”. This indicates to gameui and engine that certain UI should be enabled. * VR-enabled mods will now start up in VR mode when launched from Steam’s VR mode. Windows: * Upgraded to Visual Studio 2013. If you need to build projects for VS 2010, add /2010 to your VPC command line. OSX: * Upgraded to XCode 5. --- mp/src/tier1/mempool.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'mp/src/tier1/mempool.cpp') diff --git a/mp/src/tier1/mempool.cpp b/mp/src/tier1/mempool.cpp index 7ebbbf0b..fa49edb5 100644 --- a/mp/src/tier1/mempool.cpp +++ b/mp/src/tier1/mempool.cpp @@ -32,7 +32,7 @@ void CUtlMemoryPool::SetErrorReportFunc( MemoryPoolReportFunc_t func ) CUtlMemoryPool::CUtlMemoryPool( int blockSize, int numElements, int growMode, const char *pszAllocOwner, int nAlignment ) { #ifdef _X360 - if( numElements > 0 && growMode != GROW_NONE ) + if( numElements > 0 && growMode != UTLMEMORYPOOL_GROW_NONE ) { numElements = 1; } @@ -157,18 +157,18 @@ void CUtlMemoryPool::AddNewBlob() int sizeMultiplier; - if( m_GrowMode == GROW_SLOW ) + if( m_GrowMode == UTLMEMORYPOOL_GROW_SLOW ) { sizeMultiplier = 1; } else { - if ( m_GrowMode == GROW_NONE ) + if ( m_GrowMode == UTLMEMORYPOOL_GROW_NONE ) { // Can only have one allocation when we're in this mode if( m_NumBlobs != 0 ) { - Assert( !"CUtlMemoryPool::AddNewBlob: mode == GROW_NONE" ); + Assert( !"CUtlMemoryPool::AddNewBlob: mode == UTLMEMORYPOOL_GROW_NONE" ); return; } } @@ -231,10 +231,10 @@ void *CUtlMemoryPool::Alloc( size_t amount ) if( !m_pHeadOfFreeList ) { - // returning NULL is fine in GROW_NONE - if( m_GrowMode == GROW_NONE ) + // returning NULL is fine in UTLMEMORYPOOL_GROW_NONE + if( m_GrowMode == UTLMEMORYPOOL_GROW_NONE ) { - //Assert( !"CUtlMemoryPool::Alloc: tried to make new blob with GROW_NONE" ); + //Assert( !"CUtlMemoryPool::Alloc: tried to make new blob with UTLMEMORYPOOL_GROW_NONE" ); return NULL; } -- cgit v1.2.3