From: Samual Lenks <samual@xonotic.org>
Date: Mon, 1 Jul 2013 01:37:03 +0000 (-0400)
Subject: Add debug info to config dumper
X-Git-Tag: xonotic-v0.8.0~152^2~352
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=78ef40c418b14d46d548487ba9bad7c31e6bb513;p=xonotic%2Fxonotic-data.pk3dir.git

Add debug info to config dumper
---

diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc
index 078224365..4cd2c3bea 100644
--- a/qcsrc/common/weapons/config.qc
+++ b/qcsrc/common/weapons/config.qc
@@ -27,7 +27,7 @@ float W_Config_Queue_Compare(float root, float child, entity pass)
 
 void Dump_Weapon_Settings(void)
 {
-	float i, x;
+	float i, x, totalsettings = 0;
 	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 	{
 		// step 1: clear the queue
@@ -42,110 +42,14 @@ void Dump_Weapon_Settings(void)
 		heapsort(WEP_CONFIG_COUNT, W_Config_Queue_Swap, W_Config_Queue_Compare, world);
 		
 		// step 4: write queue
-		WEP_CONFIG_WRITETOFILE(sprintf("// {{{ #%d: %s\n// %d settings\n", i, W_Name(i), WEP_CONFIG_COUNT))
+		WEP_CONFIG_WRITETOFILE(sprintf("// {{{ #%d: %s\n", i, W_Name(i)))
 		for(x = 0; x <= WEP_CONFIG_COUNT; ++x)
 			{ WEP_CONFIG_WRITETOFILE(wep_config_queue[x]) }
 		WEP_CONFIG_WRITETOFILE("// }}}\n")
-	}
-}
-	/*
-	 * float WEP_CONFIG_COUNT;
-string wep_config_queue[MAX_WEP_CONFIG];
-	#define WEP_BAL_WRITE(a) { \
-		fputs(fh, a); \
-		if(alsoprint) { print(a); } }
-	#define WEP_BAL_WRITE_ENTITY(description) { \
-		notif_msg = \
-			sprintf( \
-				"seta notification_%s \"%d\" \"%s\"\n", \
-				e.nent_name, e.nent_default, description \
-			); \
-		WEP_BAL_WRITE(notif_msg) }
-	#define WEP_BAL_WRITE_HARDCODED(cvar,default,description) { \
-		notif_msg = \
-			sprintf( \
-				"seta notification_%s \"%s\" \"%s\"\n", \
-				cvar, default, description \
-			); \
-		WEP_BAL_WRITE(notif_msg) }
-
-	string notif_msg;
-	float i;
-	entity e;
-
-	NOTIF_WRITE(sprintf("\n// MSG_ANNCE notifications (count = %d):\n", NOTIF_ANNCE_COUNT));
-	for(i = 1; i <= NOTIF_ANNCE_COUNT; ++i)
-	{
-		e = Get_Notif_Ent(MSG_ANNCE, i);
-		if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
-		
-		NOTIF_WRITE_ENTITY(
-			"Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)"
-		);
-	}
-
-	NOTIF_WRITE(sprintf("\n// MSG_INFO notifications (count = %d):\n", NOTIF_INFO_COUNT));
-	for(i = 1; i <= NOTIF_INFO_COUNT; ++i)
-	{
-		e = Get_Notif_Ent(MSG_INFO, i);
-		if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
-		
-		NOTIF_WRITE_ENTITY(
-			"Notification control cvar: 0 = off, 1 = print to console, "
-			"2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-		);
-	}
 
-	NOTIF_WRITE(sprintf("\n// MSG_CENTER notifications (count = %d):\n", NOTIF_CENTER_COUNT));
-	for(i = 1; i <= NOTIF_CENTER_COUNT; ++i)
-	{
-		e = Get_Notif_Ent(MSG_CENTER, i);
-		if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
-		
-		NOTIF_WRITE_ENTITY(
-			"Notification control cvar: 0 = off, 1 = centerprint"
-		);
-	}
-
-	NOTIF_WRITE(sprintf("\n// MSG_MULTI notifications (count = %d):\n", NOTIF_MULTI_COUNT));
-	for(i = 1; i <= NOTIF_MULTI_COUNT; ++i)
-	{
-		e = Get_Notif_Ent(MSG_MULTI, i);
-		if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
-		
-		NOTIF_WRITE_ENTITY(
-			"Notification control cvar: 0 = off, 1 = trigger subcalls"
-		);
+		// step 5: debug info
+		print(sprintf("#%d: %s: %d settings...\n", i, W_Name(i), WEP_CONFIG_COUNT));
+		totalsettings += WEP_CONFIG_COUNT;
 	}
-
-	// edit these to match whichever cvars are used for specific notification options
-	NOTIF_WRITE("\n// HARD CODED notification variables:\n");
-	
-	NOTIF_WRITE_HARDCODED(
-		"allow_chatboxprint", "1",
-		"Allow notifications to be printed to chat box by setting notification cvar to 2 "
-		"(You can also set this cvar to 2 to force ALL notifications to be printed to the chatbox)"
-	);
-
-	NOTIF_WRITE(sprintf(
-		strcat(
-			"\n// Notification counts (total = %d): ",
-			"MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d\n"
-		),
-		(
-			NOTIF_ANNCE_COUNT +
-			NOTIF_INFO_COUNT +
-			NOTIF_CENTER_COUNT +
-			NOTIF_MULTI_COUNT
-		),
-		NOTIF_ANNCE_COUNT,
-		NOTIF_INFO_COUNT,
-		NOTIF_CENTER_COUNT,
-		NOTIF_MULTI_COUNT
-	));
-	
-	return;
-	#undef NOTIF_WRITE_HARDCODED
-	#undef NOTIF_WRITE_ENTITY
-	#undef NOTIF_WRITE
-}*/
+	print(sprintf("Totals: %d weapons, %d settings\n", (i - 1), totalsettings));
+}