mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -55,9 +55,9 @@ extern void ShutdownMemoryManager( void );
|
||||
|
||||
// Creates and adds a video object to list
|
||||
#ifdef EXTREME_MEMORY_DEBUGGING
|
||||
//This is the most effective way to debug memory leaks. Each memory leak will be recorded in a linked
|
||||
//This is the most effective way to debug memory leaks. Each memory leak will be recorded in a linked
|
||||
//list containing a string referring to the location in code the memory was allocated in addition to
|
||||
//the number of occurrences. The shutdown code will report all unhandled memory with exact location allocated.
|
||||
//the number of occurrences. The shutdown code will report all unhandled memory with exact location allocated.
|
||||
void DumpMemoryInfoIntoFile( UINT8 *filename, BOOLEAN fAppend );
|
||||
BOOLEAN _AddAndRecordMemAlloc( UINT32 size, UINT32 uiLineNum, UINT8 *pSourceFile );
|
||||
#define MemAlloc( size ) MemAllocXDebug( (size), __FILE__, __LINE__, NULL )
|
||||
@@ -69,13 +69,13 @@ extern void ShutdownMemoryManager( void );
|
||||
#else
|
||||
#ifdef _DEBUG
|
||||
#include <crtdbg.h>
|
||||
//This is another debug feature. Not as sophistocated, but definately not the pig the extreme system is.
|
||||
//This is another debug feature. Not as sophistocated, but definately not the pig the extreme system is.
|
||||
//This system reports all memory allocations/deallocations in the debug output.
|
||||
#define MemAlloc( size ) MemAllocReal( (size), __FILE__, __LINE__ )
|
||||
#define MemFree( ptr ) MemFreeReal( (ptr), __FILE__, __LINE__ )
|
||||
#define MemRealloc( ptr, size ) MemReallocReal( (ptr), (size), __FILE__, __LINE__ )
|
||||
extern PTR MemAllocReal( UINT32 size, const STR8 , INT32 );
|
||||
extern void MemFreeReal( PTR ptr, const STR8 , INT32 );
|
||||
extern void MemFreeReal( PTR ptr, const STR8 , INT32 );
|
||||
extern PTR MemReallocReal( PTR ptr, UINT32 size, const STR8 , INT32 );
|
||||
//void* ::operator new( size_t sz, const char* file, int line);
|
||||
//void* ::operator new[]( size_t sz, const char *file, int line);
|
||||
@@ -92,7 +92,7 @@ extern void ShutdownMemoryManager( void );
|
||||
|
||||
|
||||
|
||||
extern PTR MemAllocLocked( UINT32 size );
|
||||
extern PTR MemAllocLocked( UINT32 size );
|
||||
extern void MemFreeLocked( PTR, UINT32 size );
|
||||
|
||||
// get total free on the system at this moment
|
||||
|
||||
Reference in New Issue
Block a user