diff --git a/r5dev/tier1/utlblockmemory.h b/r5dev/tier1/utlblockmemory.h index 4e79354c..1706fae9 100644 --- a/r5dev/tier1/utlblockmemory.h +++ b/r5dev/tier1/utlblockmemory.h @@ -251,7 +251,7 @@ void CUtlBlockMemory::ChangeSize(int nBlocks) for (int i = m_nBlocks; i < nBlocksOld; ++i) { UTLBLOCKMEMORY_TRACK_FREE(); - free((void*)m_pMemory[i]); + MemAllocSingleton()->Free(m_pMemory[i]); } if (m_pMemory) @@ -305,12 +305,12 @@ void CUtlBlockMemory::Purge() for (int i = 0; i < m_nBlocks; ++i) { UTLBLOCKMEMORY_TRACK_FREE(); - free((void*)m_pMemory[i]); + MemAllocSingleton()->Free(m_pMemory[i]); } m_nBlocks = 0; UTLBLOCKMEMORY_TRACK_FREE(); - free((void*)m_pMemory); + MemAllocSingleton()->Free(m_pMemory); m_pMemory = 0; } diff --git a/r5dev/tier1/utlmemory.h b/r5dev/tier1/utlmemory.h index 81d24b1c..73d7715e 100644 --- a/r5dev/tier1/utlmemory.h +++ b/r5dev/tier1/utlmemory.h @@ -366,7 +366,7 @@ public: // Memory deallocation void Purge() { - free(m_pMemory); + MemAllocSingleton()->Free(m_pMemory); RememberAllocSize(0); m_pMemory = NULL; } @@ -853,7 +853,7 @@ void CUtlMemory::Purge() if (m_pMemory) { UTLMEMORY_TRACK_FREE(); - free((void*)m_pMemory); + MemAllocSingleton()->Free(m_pMemory); m_pMemory = 0; } m_nAllocationCount = 0; diff --git a/r5dev/tier1/utlvector.h b/r5dev/tier1/utlvector.h index f0002688..725f9cf5 100644 --- a/r5dev/tier1/utlvector.h +++ b/r5dev/tier1/utlvector.h @@ -333,24 +333,23 @@ class CUtlVectorUltraConservativeAllocator public: static void* Alloc(size_t nSize) { - return malloc(nSize); + return MemAllocSingleton()->Alloc(nSize); } static void* Realloc(void* pMem, size_t nSize) { - return realloc(pMem, nSize); + return MemAllocSingleton()->Realloc(pMem, nSize); } static void Free(void* pMem) { - free(pMem); + MemAllocSingleton()->Free(pMem); } static size_t GetSize(void* pMem) { - return mallocsize(pMem); + return MemAllocSingleton()->GetSize(pMem); } - }; template