fix crash with predicted player locations

[xonotic/darkplaces.git] / zone.h

diff --git a/zone.h b/zone.h
index 69d6f1b6d650297aed3a70e4d4445d18e56755d5..86dd59a049c9a3e1798cfc60229b50b49742dfd6 100644 (file)
--- a/zone.h
+++ b/zone.h
@@ -24,21 +24,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // LordHavoc: this is pointless with a good C library
 //#define MEMCLUMPING
 
-#define POOLNAMESIZE 128
-// if set this pool will be printed in memlist reports
-#define POOLFLAG_TEMP 1
+// div0: heap overflow detection paranoia
+//#define MEMPARANOIA 1
+
 #if MEMCLUMPING
-// give malloc padding so we can't waste most of a page at the end
-#define MEMCLUMPSIZE (65536 - 1536)
 // smallest unit we care about is this many bytes
-#define MEMUNIT 8
+#define MEMUNIT 64
+#define MEMUNITSPERINT (MEMUNIT*32)
+#define MEMUNITSPERBYTE (MEMUNIT*8)
+// 1MB clumps
+#define MEMWANTCLUMPSIZE 1048576
+// give malloc padding so we can't waste most of a page at the end
+#define MEMCLUMPSIZE (MEMWANTCLUMPSIZE - MEMWANTCLUMPSIZE/MEMUNITSPERBYTE - 128)
 #define MEMBITS (MEMCLUMPSIZE / MEMUNIT)
 #define MEMBITINTS (MEMBITS / 32)
-#define MEMCLUMP_SENTINEL 0xABADCAFE
 #endif
 
-#define MEMHEADER_SENTINEL1 0xDEADF00D
-#define MEMHEADER_SENTINEL2 0xDF
+#define POOLNAMESIZE 128
+// if set this pool will be printed in memlist reports
+#define POOLFLAG_TEMP 1
 
 typedef struct memheader_s
 {
@@ -160,8 +164,8 @@ void Mem_ExpandableArray_NewArray(memexpandablearray_t *l, mempool_t *mempool, s
 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);
+size_t Mem_ExpandableArray_IndexRange(const memexpandablearray_t *l) DP_FUNC_PURE;
+void *Mem_ExpandableArray_RecordAtIndex(const memexpandablearray_t *l, size_t index) DP_FUNC_PURE;
 
 // used for temporary allocations
 extern mempool_t *tempmempool;