X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fconfig.qc;h=7d1b4e3d262067f491fd6a555f46d1bd1f020769;hp=ab6e7905cb003d2c3cf2f0c01807337b41bcb1ba;hb=c51698509e174e343dff48128a1dcfff1527c535;hpb=ba0988ca930f50286f8cf3b6c114ebc6584964af

diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc
index ab6e7905c..7d1b4e3d2 100644
--- a/qcsrc/common/weapons/config.qc
+++ b/qcsrc/common/weapons/config.qc
@@ -1,32 +1,30 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../dpdefs/progsdefs.qc"
-    #include "../../dpdefs/dpextensions.qc"
     #include "../util.qh"
     #include "config.qh"
-    #include "weapons.qh"
+    #include "all.qh"
 #endif
 
 // ==========================
 //  Balance Config Generator
 // ==========================
 
-void W_Config_Queue_Swap(float root, float child, entity pass)
+void W_Config_Queue_Swap(int root, int child, entity pass)
 {
 	string oldroot = wep_config_queue[root];
 	wep_config_queue[root] = wep_config_queue[child];
 	wep_config_queue[child] = oldroot;
 }
 
-float W_Config_Queue_Compare(float root, float child, entity pass)
+float W_Config_Queue_Compare(int root, int child, entity pass)
 {
 	return strcmp(wep_config_queue[root], wep_config_queue[child]);
 }
 
 void Dump_Weapon_Settings(void)
 {
-	float i, x, totalsettings = 0;
+	int i, x, totalsettings = 0;
 	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 	{
 		// step 1: clear the queue
@@ -35,11 +33,12 @@ void Dump_Weapon_Settings(void)
 			{ wep_config_queue[x] = string_null; }
 
 		// step 2: build new queue
-		WEP_ACTION(i, WR_CONFIG);
+		Weapon w = get_weaponinfo(i);
+		w.wr_config(w);
 
 		// step 3: sort queue
 		heapsort(WEP_CONFIG_COUNT, W_Config_Queue_Swap, W_Config_Queue_Compare, world);
-		
+
 		// step 4: write queue
 		WEP_CONFIG_WRITETOFILE(sprintf(
 			"// {{{ #%d: %s%s\n",
@@ -51,7 +50,7 @@ void Dump_Weapon_Settings(void)
 		WEP_CONFIG_WRITETOFILE("// }}}\n");
 
 		// step 5: debug info
-		print(sprintf("#%d: %s: %d settings...\n", i, WEP_NAME(i), WEP_CONFIG_COUNT));
+		LOG_INFO(sprintf("#%d: %s: %d settings...\n", i, WEP_NAME(i), WEP_CONFIG_COUNT));
 		totalsettings += WEP_CONFIG_COUNT;
 	}
 
@@ -61,5 +60,5 @@ void Dump_Weapon_Settings(void)
 		{ wep_config_queue[x] = string_null; }
 
 	// extra information
-	print(sprintf("Totals: %d weapons, %d settings\n", (i - 1), totalsettings));
+	LOG_INFO(sprintf("Totals: %d weapons, %d settings\n", (i - 1), totalsettings));
 }