From 126138bb063f3409702a35c29ef8113f3f722eaa Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 5 Sep 2008 01:18:52 +0000 Subject: Remove z_zone.c and tables.c, as these are identical to the version in Doom. Subversion-branch: /branches/raven-branch Subversion-revision: 1199 --- src/heretic/doomdef.h | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) (limited to 'src/heretic/doomdef.h') diff --git a/src/heretic/doomdef.h b/src/heretic/doomdef.h index a672b2e5..21adbc2a 100644 --- a/src/heretic/doomdef.h +++ b/src/heretic/doomdef.h @@ -778,47 +778,7 @@ long LongSwap(long); #endif -//----------- -//MEMORY ZONE -//----------- -// tags < 100 are not overwritten until freed -#define PU_STATIC 1 // static entire execution time -#define PU_SOUND 2 // static while playing -#define PU_MUSIC 3 // static while playing -#define PU_DAVE 4 // anything else Dave wants static -#define PU_LEVEL 50 // static until level exited -#define PU_LEVSPEC 51 // a special thinker in a level -// tags >= 100 are purgable whenever needed -#define PU_PURGELEVEL 100 -#define PU_CACHE 101 - -void Z_Init(void); -void *Z_Malloc(int size, int tag, void *ptr); -void Z_Free(void *ptr); -void Z_FreeTags(int lowtag, int hightag); -void Z_DumpHeap(int lowtag, int hightag); -void Z_FileDumpHeap(FILE * f); -void Z_CheckHeap(void); -void Z_ChangeTag2(void *ptr, int tag); -int Z_FreeMemory(void); - -extern boolean MallocFailureOk; - -typedef struct memblock_s -{ - int size; // including the header and possibly tiny fragments - void **user; // NULL if a free block - int tag; // purgelevel - int id; // should be ZONEID - struct memblock_s *next, *prev; -} memblock_t; - -#define Z_ChangeTag(p,t) \ -{ \ -if (( (memblock_t *)( (byte *)(p) - sizeof(memblock_t)))->id!=0x1d4a11) \ - I_Error("Z_CT at "__FILE__":%i",__LINE__); \ -Z_ChangeTag2(p,t); \ -}; +#include "z_zone.h" //------- //WADFILE -- cgit v1.2.3