diff --git a/src/game/memory/srrmemory.cpp b/src/game/memory/srrmemory.cpp index da75585..2bbb330 100644 --- a/src/game/memory/srrmemory.cpp +++ b/src/game/memory/srrmemory.cpp @@ -150,6 +150,7 @@ inline void* AllocateThis( GameMemoryAllocator allocator, size_t size ) return pMemory; } +#ifdef SRR_OVERLOAD_BUILTIN_NEW //============================================================================== // new //============================================================================== @@ -194,6 +195,7 @@ throw( std::bad_alloc ) return( pMemory ); } +#endif //============================================================================== @@ -207,14 +209,14 @@ throw( std::bad_alloc ) // Return: // //============================================================================== -void operator delete( void* pMemory ) +void operator delete(void* pMemory) #ifdef RAD_PS2 #ifndef RAD_MW throw() #endif #endif { - radMemoryFree( pMemory ); + radMemoryFree(pMemory); } diff --git a/src/game/memory/srrmemory.h b/src/game/memory/srrmemory.h index d4343e7..a56e2fe 100644 --- a/src/game/memory/srrmemory.h +++ b/src/game/memory/srrmemory.h @@ -46,6 +46,7 @@ extern bool gMemorySystemInitialized; +#ifdef SRR_OVERLOAD_BUILTIN_NEW // // Override built-in new. @@ -58,17 +59,6 @@ throw( std::bad_alloc ) #endif ; -// -// Override built-in delete. -// -void operator delete( void* pMemory ) -#ifdef RAD_PS2 -#ifndef RAD_MW -throw() -#endif -#endif -; - // // Override built-in array new. // @@ -80,6 +70,19 @@ throw( std::bad_alloc ) #endif ; +#endif + +// +// Override built-in delete. +// +void operator delete(void* pMemory) +#ifdef RAD_PS2 +#ifndef RAD_MW +throw() +#endif +#endif +; + // // Override built-in array delete. //