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

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index 9e21414ce..410dbdfad 100644
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -1,50 +1,49 @@
+#ifndef WEAPONS_CONFIG_H
+#define WEAPONS_CONFIG_H
+
 // ==========================
 //  Balance Config Generator
 // ==========================
 
 void Dump_Weapon_Settings(void);
-float wep_config_file;
-float wep_config_alsoprint;
+int wep_config_file;
+bool wep_config_alsoprint;
 
-#define MAX_WEP_CONFIG 256
-float WEP_CONFIG_COUNT;
+const int MAX_WEP_CONFIG = 256;
+int WEP_CONFIG_COUNT;
 string wep_config_queue[MAX_WEP_CONFIG];
 
 #define WEP_CONFIG_QUEUE(a) { \
 	wep_config_queue[WEP_CONFIG_COUNT] = a; \
 	++WEP_CONFIG_COUNT; }
 
-#define WEP_CONFIG_WRITETOFILE(a) { \
+#define WEP_CONFIG_WRITETOFILE(a) do { \
 	fputs(wep_config_file, a); \
-	if(wep_config_alsoprint) { print(a); } }
-
-#define WEP_CONFIG_WRITE_CVARS_MO_PRI(wepname,name) \
-	{ WEP_CONFIG_QUEUE( \
-		sprintf("set g_balance_%s_primary_%s %g\n", #wepname, #name, \
-		cvar(sprintf("g_balance_%s_primary_%s", #wepname, #name)))) }
+	if(wep_config_alsoprint) { LOG_INFO(a); } \
+} while(0)
 
-#define WEP_CONFIG_WRITE_CVARS_MO_SEC(wepname,name) \
-	{ WEP_CONFIG_QUEUE( \
-		sprintf("set g_balance_%s_secondary_%s %g\n", #wepname, #name, \
-		cvar(sprintf("g_balance_%s_secondary_%s", #wepname, #name)))) }
-		
-#define WEP_CONFIG_WRITE_CVARS_MO_BOTH(wepname,name) \
-	{ WEP_CONFIG_QUEUE( \
-		sprintf("set g_balance_%s_primary_%s %g\n", #wepname, #name, \
-		cvar(sprintf("g_balance_%s_primary_%s", #wepname, #name)))) } \
-	{ WEP_CONFIG_QUEUE( \
-		sprintf("set g_balance_%s_secondary_%s %g\n", #wepname, #name, \
-		cvar(sprintf("g_balance_%s_secondary_%s", #wepname, #name)))) }
-
-#define WEP_CONFIG_WRITE_CVARS_MO_NONE(wepname,name) \
+#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)))) }
 
+#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)
+
 #define WEP_CONFIG_WRITE_CVARS(wepid,wepname,mode,name) WEP_CONFIG_WRITE_CVARS_##mode(wepname, name)
 
-// WEAPONTODO: remove prop
-#define WEP_CONFIG_WRITE_PROPS(wepid,wepname,mode,name) \
+#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)))) }
+
+#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)))) }
+
+#define WEP_CONFIG_WRITE_PROPS(wepid,wepname,type,prop,name) WEP_CONFIG_WRITE_PROPS_##type(wepname,name)
+#endif