todo items went from 465 to 459 by finding items that was already done or duplicates

[xonotic/darkplaces.git] / zone.h

diff --git a/zone.h b/zone.h
index 0ef231be6fbe35e7b17114228e8043b0996167a3..69d6f1b6d650297aed3a70e4d4445d18e56755d5 100644 (file)
--- a/zone.h
+++ b/zone.h
@@ -66,7 +66,7 @@ memheader_t;
 typedef struct memclump_s
 {
        // contents of the clump
-       qbyte block[MEMCLUMPSIZE];
+       unsigned char block[MEMCLUMPSIZE];
        // should always be MEMCLUMP_SENTINEL
        unsigned int sentinel1;
        // if a bit is on, it means that the MEMUNIT bytes it represents are
@@ -103,8 +103,6 @@ typedef struct mempool_s
        size_t realsize;
        // updated each time the pool is displayed by memlist, shows change from previous time (unless pool was freed)
        size_t lastchecksize;
-       // name of the pool
-       char name[POOLNAMESIZE];
        // linked into global mempool list
        struct mempool_s *next;
        // parent object (used for nested memory pools)
@@ -112,6 +110,8 @@ typedef struct mempool_s
        // file name and line where Mem_AllocPool was called
        const char *filename;
        int fileline;
+       // name of the pool
+       char name[POOLNAMESIZE];
        // should always be MEMHEADER_SENTINEL1
        unsigned int sentinel2;
 }
@@ -132,10 +132,39 @@ void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline);
 void _Mem_EmptyPool(mempool_t *pool, const char *filename, int fileline);
 void _Mem_CheckSentinels(void *data, const char *filename, int fileline);
 void _Mem_CheckSentinelsGlobal(const char *filename, int fileline);
+// if pool is NULL this searches ALL pools for the allocation
 qboolean Mem_IsAllocated(mempool_t *pool, void *data);
 
+char* Mem_strdup (mempool_t *pool, const char* s);
+
+typedef struct memexpandablearray_array_s
+{
+       unsigned char *data;
+       unsigned char *allocflags;
+       size_t numflaggedrecords;
+}
+memexpandablearray_array_t;
+
+typedef struct memexpandablearray_s
+{
+       mempool_t *mempool;
+       size_t recordsize;
+       size_t numrecordsperarray;
+       size_t numarrays;
+       size_t maxarrays;
+       memexpandablearray_array_t *arrays;
+}
+memexpandablearray_t;
+
+void Mem_ExpandableArray_NewArray(memexpandablearray_t *l, mempool_t *mempool, size_t recordsize, int numrecordsperarray);
+void Mem_ExpandableArray_FreeArray(memexpandablearray_t *l);
+void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l);
+void Mem_ExpandableArray_FreeRecord(memexpandablearray_t *l, void *record);
+size_t Mem_ExpandableArray_IndexRange(memexpandablearray_t *l);
+void *Mem_ExpandableArray_RecordAtIndex(memexpandablearray_t *l, size_t index);
+
 // used for temporary allocations
-mempool_t *tempmempool;
+extern mempool_t *tempmempool;
 
 void Memory_Init (void);
 void Memory_Shutdown (void);