X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=zone.c;h=5a0c8987a0c3e2f184999aa0ed09e2ff46dc72bc;hb=47d1f32605adf4633cbd77d8152b2da0533fe263;hp=2aa575e786b442cd96a59f683c856f4f89bac3da;hpb=2af7bf1a4eb9a5c9a1cfe76f9f8690523bafbd3e;p=xonotic%2Fdarkplaces.git

diff --git a/zone.c b/zone.c
index 2aa575e7..5a0c8987 100644
--- a/zone.c
+++ b/zone.c
@@ -45,7 +45,7 @@ void *mem_mutex = NULL;
 # define FILE_BACKED_MALLOC 0
 #endif
 
-// LordHavoc: enables our own low-level allocator (instead of malloc)
+// LadyHavoc: enables our own low-level allocator (instead of malloc)
 #ifndef MEMCLUMPING
 # define MEMCLUMPING 0
 #endif
@@ -93,11 +93,11 @@ static memclump_t *clumpchain = NULL;
 #endif
 
 
-cvar_t developer_memory = {0, "developer_memory", "0", "prints debugging information about memory allocations"};
-cvar_t developer_memorydebug = {0, "developer_memorydebug", "0", "enables memory corruption checks (very slow)"};
-cvar_t developer_memoryreportlargerthanmb = {0, "developer_memorylargerthanmb", "16", "prints debugging information about memory allocations over this size"};
-cvar_t sys_memsize_physical = {CVAR_READONLY, "sys_memsize_physical", "", "physical memory size in MB (or empty if unknown)"};
-cvar_t sys_memsize_virtual = {CVAR_READONLY, "sys_memsize_virtual", "", "virtual memory size in MB (or empty if unknown)"};
+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)"};
 
 static mempool_t *poolchain = NULL;
 
@@ -845,16 +845,16 @@ void Mem_PrintList(size_t minallocationsize)
 	}
 }
 
-static void MemList_f(void)
+static void MemList_f(cmd_state_t *cmd)
 {
-	switch(Cmd_Argc())
+	switch(Cmd_Argc(cmd))
 	{
 	case 1:
 		Mem_PrintList(1<<30);
 		Mem_PrintStats();
 		break;
 	case 2:
-		Mem_PrintList(atoi(Cmd_Argv(1)) * 1024);
+		Mem_PrintList(atoi(Cmd_Argv(cmd, 1)) * 1024);
 		Mem_PrintStats();
 		break;
 	default:
@@ -863,7 +863,7 @@ static void MemList_f(void)
 	}
 }
 
-static void MemStats_f(void)
+static void MemStats_f(cmd_state_t *cmd)
 {
 	Mem_CheckSentinelsGlobal();
 	R_TextureStats_Print(false, false, true);
@@ -916,8 +916,9 @@ void Memory_Shutdown (void)
 
 void Memory_Init_Commands (void)
 {
-	Cmd_AddCommand ("memstats", MemStats_f, "prints memory system statistics");
-	Cmd_AddCommand ("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(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)");
+
 	Cvar_RegisterVariable (&developer_memory);
 	Cvar_RegisterVariable (&developer_memorydebug);
 	Cvar_RegisterVariable (&developer_memoryreportlargerthanmb);