IOQ3 commit 2206

This commit is contained in:
Richard Allen 2012-01-13 17:23:12 +00:00
parent 5a4cf01a59
commit c486531580

View file

@ -966,12 +966,16 @@ void *Z_TagMalloc( int size, int tag ) {
do { do {
if (rover == start) { if (rover == start) {
// scaned all the way around the list
#ifdef ZONE_DEBUG #ifdef ZONE_DEBUG
Z_LogHeap(); Z_LogHeap();
#endif
// scaned all the way around the list Com_Error(ERR_FATAL, "Z_Malloc: failed on allocation of %i bytes from the %s zone: %s, line: %d (%s)",
Com_Error( ERR_FATAL, "Z_Malloc: failed on allocation of %i bytes from the %s zone", size, zone == smallzone ? "small" : "main", file, line, label);
#else
Com_Error(ERR_FATAL, "Z_Malloc: failed on allocation of %i bytes from the %s zone",
size, zone == smallzone ? "small" : "main"); size, zone == smallzone ? "small" : "main");
#endif
return NULL; return NULL;
} }
if (rover->tag) { if (rover->tag) {
@ -1724,8 +1728,11 @@ void *Hunk_Alloc( int size, ha_pref preference ) {
#ifdef HUNK_DEBUG #ifdef HUNK_DEBUG
Hunk_Log(); Hunk_Log();
Hunk_SmallLog(); Hunk_SmallLog();
Com_Error(ERR_DROP, "Hunk_Alloc failed on %i: %s, line: %d (%s)", size, file, line, label);
#else
Com_Error(ERR_DROP, "Hunk_Alloc failed on %i", size);
#endif #endif
Com_Error( ERR_DROP, "Hunk_Alloc failed on %i", size );
} }
if ( hunk_permanent == &hunk_low ) { if ( hunk_permanent == &hunk_low ) {