X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fconfig.qh;h=410dbdfadeb8b1f7fe79e4eeacf63bdf1a7e14d0;hb=6cc2d1aa115907d16ae84fb07c3fe6c3329cd9b5;hp=454ee22a2396b93458a4461c72d6561dd9d1c711;hpb=6c6c3e75dda010c83c9a27ecaf3fc21fd4f88be0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index 454ee22a2..410dbdfad 100644
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -1,111 +1,49 @@
+#ifndef WEAPONS_CONFIG_H
+#define WEAPONS_CONFIG_H
+
 // ==========================
 //  Balance Config Generator
 // ==========================
 
-void Dump_Weapon_Settings(float fh, float alsoprint)
-{
-	float i;
-	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-	{
-		WEP_ACTION(i, WR_CONFIG)
-	}
+void Dump_Weapon_Settings(void);
+int wep_config_file;
+bool wep_config_alsoprint;
+
+const int MAX_WEP_CONFIG = 256;
+int 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) }
+#define WEP_CONFIG_QUEUE(a) { \
+	wep_config_queue[WEP_CONFIG_COUNT] = a; \
+	++WEP_CONFIG_COUNT; }
 
-	string notif_msg;
-	float i;
-	entity e;
+#define WEP_CONFIG_WRITETOFILE(a) do { \
+	fputs(wep_config_file, a); \
+	if(wep_config_alsoprint) { LOG_INFO(a); } \
+} while(0)
 
-	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)"
-		);
-	}
+#define WEP_CONFIG_WRITE_CVARS_NONE(wepname,name) \
+	{ WEP_CONFIG_QUEUE( \
+		sprintf("set g_balance_%s_%s %g\n", #wepname, #name, \
+		cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) }
 
-	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)"
-		);
-	}
+#define WEP_CONFIG_WRITE_CVARS_PRI(wepname,name) WEP_CONFIG_WRITE_CVARS_NONE(wepname, primary_##name)
+#define WEP_CONFIG_WRITE_CVARS_SEC(wepname,name) WEP_CONFIG_WRITE_CVARS_NONE(wepname, secondary_##name)
+#define WEP_CONFIG_WRITE_CVARS_BOTH(wepname,name) \
+	WEP_CONFIG_WRITE_CVARS_PRI(wepname, name) \
+	WEP_CONFIG_WRITE_CVARS_SEC(wepname, name)
 
-	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"
-		);
-	}
+#define WEP_CONFIG_WRITE_CVARS(wepid,wepname,mode,name) WEP_CONFIG_WRITE_CVARS_##mode(wepname, name)
 
-	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"
-		);
-	}
+#define WEP_CONFIG_WRITE_PROPS_string(wepname,name) \
+	{ WEP_CONFIG_QUEUE( \
+		sprintf("set g_balance_%s_%s \"%s\"\n", #wepname, #name, \
+		cvar_string(sprintf("g_balance_%s_%s", #wepname, #name)))) }
 
-	// 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)"
-	);
+#define WEP_CONFIG_WRITE_PROPS_float(wepname,name) \
+	{ WEP_CONFIG_QUEUE( \
+		sprintf("set g_balance_%s_%s %g\n", #wepname, #name, \
+		cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) }
 
-	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
-}
+#define WEP_CONFIG_WRITE_PROPS(wepid,wepname,type,prop,name) WEP_CONFIG_WRITE_PROPS_##type(wepname,name)
+#endif