X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=zone.c;h=ddc7d1003ba4cdb93f711d77c4f3401c1df9143e;hb=284f629a0f79a6107caa0c821a314609565b0f64;hp=889adc9d0c86bc54bb9c2eb97bb5451fa88452ad;hpb=d39861bfe72a5a9ec8cfbcc83457db58a74b75d9;p=xonotic%2Fdarkplaces.git

diff --git a/zone.c b/zone.c
index 889adc9d..ddc7d100 100644
--- a/zone.c
+++ b/zone.c
@@ -329,7 +329,7 @@ void *_Mem_Alloc(mempool_t *pool, void *olddata, size_t size, size_t alignment,
 		Sys_Error("Mem_Alloc: pool == NULL (alloc at %s:%i)", filename, fileline);
 	if (developer_memory.integer)
 		Con_DPrintf("Mem_Alloc: pool %s, file %s:%i, size %i bytes\n", pool->name, filename, fileline, (int)size);
-	//if (developer.integer && developer_memorydebug.integer)
+	//if (developer.integer > 0 && developer_memorydebug.integer)
 	//	_Mem_CheckSentinelsGlobal(filename, fileline);
 	pool->totalsize += size;
 	realsize = alignment + sizeof(memheader_t) + size + sizeof(sentinel2);
@@ -627,6 +627,44 @@ void Mem_ExpandableArray_FreeArray(memexpandablearray_t *l)
 	memset(l, 0, sizeof(*l));
 }
 
+// VorteX: hacked Mem_ExpandableArray_AllocRecord, it does allocate record at certain index
+void *Mem_ExpandableArray_AllocRecordAtIndex(memexpandablearray_t *l, size_t index)
+{
+	size_t j;
+	if (index == l->numarrays)
+	{
+		if (l->numarrays == l->maxarrays)
+		{
+			memexpandablearray_array_t *oldarrays = l->arrays;
+			l->maxarrays = max(l->maxarrays * 2, 128);
+			l->arrays = (memexpandablearray_array_t*) Mem_Alloc(l->mempool, l->maxarrays * sizeof(*l->arrays));
+			if (oldarrays)
+			{
+				memcpy(l->arrays, oldarrays, l->numarrays * sizeof(*l->arrays));
+				Mem_Free(oldarrays);
+			}
+		}
+		l->arrays[index].numflaggedrecords = 0;
+		l->arrays[index].data = (unsigned char *) Mem_Alloc(l->mempool, (l->recordsize + 1) * l->numrecordsperarray);
+		l->arrays[index].allocflags = l->arrays[index].data + l->recordsize * l->numrecordsperarray;
+		l->numarrays++;
+	}
+	if (l->arrays[index].numflaggedrecords < l->numrecordsperarray)
+	{
+		for (j = 0;j < l->numrecordsperarray;j++)
+		{
+			if (!l->arrays[index].allocflags[j])
+			{
+				l->arrays[index].allocflags[j] = true;
+				l->arrays[index].numflaggedrecords++;
+				memset(l->arrays[index].data + l->recordsize * j, 0, l->recordsize);
+				return (void *)(l->arrays[index].data + l->recordsize * j);
+			}
+		}
+	}
+	return NULL;
+}
+
 void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l)
 {
 	size_t i, j;