X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=zone.c;h=b357a013aeec18f0c7d491a081608c37c6c764c7;hb=5f3b11852a5a1a52ec62244c1330ad02ab739142;hp=1298c1773bd015601c1213052a4de76be1ad21cb;hpb=0a05c446ba26bd5897645a37ceec8646c5bc93eb;p=xonotic%2Fdarkplaces.git

diff --git a/zone.c b/zone.c
index 1298c177..b357a013 100644
--- a/zone.c
+++ b/zone.c
@@ -19,8 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // Z_zone.c
 
-#include "quakedef.h"
-#include "thread.h"
+#include "darkplaces.h"
 
 #ifdef WIN32
 #include <windows.h>
@@ -29,11 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <unistd.h>
 #endif
 
-#ifdef _MSC_VER
-#include <vadefs.h>
-#else
-#include <stdint.h>
-#endif
 #define MEMHEADER_SENTINEL_FOR_ADDRESS(p) ((sentinel_seed ^ (unsigned int) (uintptr_t) (p)) + sentinel_seed)
 unsigned int sentinel_seed;
 
@@ -93,11 +87,11 @@ static memclump_t *clumpchain = NULL;
 #endif
 
 
-cvar_t developer_memory = {CVAR_CLIENT | CVAR_SERVER, "developer_memory", "0", "prints debugging information about memory allocations"};
-cvar_t developer_memorydebug = {CVAR_CLIENT | CVAR_SERVER, "developer_memorydebug", "0", "enables memory corruption checks (very slow)"};
-cvar_t developer_memoryreportlargerthanmb = {CVAR_CLIENT | CVAR_SERVER, "developer_memorylargerthanmb", "16", "prints debugging information about memory allocations over this size"};
-cvar_t sys_memsize_physical = {CVAR_CLIENT | CVAR_SERVER | CVAR_READONLY, "sys_memsize_physical", "", "physical memory size in MB (or empty if unknown)"};
-cvar_t sys_memsize_virtual = {CVAR_CLIENT | CVAR_SERVER | CVAR_READONLY, "sys_memsize_virtual", "", "virtual memory size in MB (or empty if unknown)"};
+cvar_t developer_memory = {CF_CLIENT | CF_SERVER, "developer_memory", "0", "prints debugging information about memory allocations"};
+cvar_t developer_memorydebug = {CF_CLIENT | CF_SERVER, "developer_memorydebug", "0", "enables memory corruption checks (very slow)"};
+cvar_t developer_memoryreportlargerthanmb = {CF_CLIENT | CF_SERVER, "developer_memorylargerthanmb", "16", "prints debugging information about memory allocations over this size"};
+cvar_t sys_memsize_physical = {CF_CLIENT | CF_SERVER | CF_READONLY, "sys_memsize_physical", "", "physical memory size in MB (or empty if unknown)"};
+cvar_t sys_memsize_virtual = {CF_CLIENT | CF_SERVER | CF_READONLY, "sys_memsize_virtual", "", "virtual memory size in MB (or empty if unknown)"};
 
 static mempool_t *poolchain = NULL;
 
@@ -207,14 +201,14 @@ static void *Clump_AllocBlock(size_t size)
 #if MEMCLUMPING
 	if (size <= MEMCLUMPSIZE)
 	{
-		int index;
-		unsigned int bit;
-		unsigned int needbits;
-		unsigned int startbit;
-		unsigned int endbit;
-		unsigned int needints;
-		int startindex;
-		int endindex;
+		intptr_t index;
+		size_t bit;
+		size_t needbits;
+		size_t startbit;
+		size_t endbit;
+		size_t needints;
+		intptr_t startindex;
+		intptr_t endindex;
 		unsigned int value;
 		unsigned int mask;
 		unsigned int *array;
@@ -318,10 +312,10 @@ nofreeblock:
 static void Clump_FreeBlock(void *base, size_t size)
 {
 #if MEMCLUMPING
-	unsigned int needbits;
-	unsigned int startbit;
-	unsigned int endbit;
-	unsigned int bit;
+	size_t needbits;
+	size_t startbit;
+	size_t endbit;
+	size_t bit;
 	memclump_t **clumpchainpointer;
 	memclump_t *clump;
 	unsigned char *start = (unsigned char *)base;
@@ -869,8 +863,6 @@ static void MemList_f(cmd_state_t *cmd)
 static void MemStats_f(cmd_state_t *cmd)
 {
 	Mem_CheckSentinelsGlobal();
-	R_TextureStats_Print(false, false, true);
-	GL_Mesh_ListVBOs(false);
 	Mem_PrintStats();
 }
 
@@ -919,8 +911,8 @@ void Memory_Shutdown (void)
 
 void Memory_Init_Commands (void)
 {
-	Cmd_AddCommand(CMD_SHARED, "memstats", MemStats_f, "prints memory system statistics");
-	Cmd_AddCommand(CMD_SHARED, "memlist", MemList_f, "prints memory pool information (or if used as memlist 5 lists individual allocations of 5K or larger, 0 lists all allocations)");
+	Cmd_AddCommand(CF_SHARED, "memstats", MemStats_f, "prints memory system statistics");
+	Cmd_AddCommand(CF_SHARED, "memlist", MemList_f, "prints memory pool information (or if used as memlist 5 lists individual allocations of 5K or larger, 0 lists all allocations)");
 
 	Cvar_RegisterVariable (&developer_memory);
 	Cvar_RegisterVariable (&developer_memorydebug);