X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fconfig.qc;h=a8194772cc69fad609edcd5e7cd1a299f69a49e8;hb=29ba411594428929a9e9a0e0baa620210213bec7;hp=b90c01f4a65abd6e300485335c03fa2bd74e32ed;hpb=5607e279fe7b0dc9f92e15556ed6dc33f17f549c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc
index b90c01f4a..a8194772c 100644
--- a/qcsrc/common/weapons/config.qc
+++ b/qcsrc/common/weapons/config.qc
@@ -1,10 +1,8 @@
+#include "config.qh"
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
-    #include "../util.qh"
-    #include "config.qh"
+    #include <common/util.qh>
     #include "all.qh"
 #endif
 
@@ -14,52 +12,52 @@
 
 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;
+	string oldroot = config_queue[root];
+	config_queue[root] = config_queue[child];
+	config_queue[child] = oldroot;
 }
 
 float W_Config_Queue_Compare(int root, int child, entity pass)
 {
-	return strcmp(wep_config_queue[root], wep_config_queue[child]);
+	return strcmp(config_queue[root], config_queue[child]);
 }
 
-void Dump_Weapon_Settings(void)
+void Dump_Weapon_Settings()
 {
-	int i, x, totalsettings = 0;
-	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-	{
+	int totalweapons = 0, totalsettings = 0;
+	FOREACH(Weapons, it != WEP_Null, {
 		// step 1: clear the queue
 		WEP_CONFIG_COUNT = 0;
-		for(x = 0; x <= MAX_WEP_CONFIG; ++x)
-			{ wep_config_queue[x] = string_null; }
+		for (int x = 0; x <= MAX_CONFIG_SETTINGS; ++x)
+			config_queue[x] = string_null;
 
 		// step 2: build new queue
-		WEP_ACTION(i, WR_CONFIG);
+		it.wr_config(it);
 
 		// step 3: sort queue
-		heapsort(WEP_CONFIG_COUNT, W_Config_Queue_Swap, W_Config_Queue_Compare, world);
+		heapsort(WEP_CONFIG_COUNT, W_Config_Queue_Swap, W_Config_Queue_Compare, NULL);
 
 		// step 4: write queue
 		WEP_CONFIG_WRITETOFILE(sprintf(
 			"// {{{ #%d: %s%s\n",
 			i,
-			WEP_NAME(i),
-			(((get_weaponinfo(i)).spawnflags & WEP_FLAG_MUTATORBLOCKED) ? " (MUTATOR WEAPON)" : "")
+			it.m_name,
+			((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) ? " (MUTATOR WEAPON)" : "")
 		));
-		for(x = 0; x <= WEP_CONFIG_COUNT; ++x) { WEP_CONFIG_WRITETOFILE(wep_config_queue[x]); }
+		for (int x = 0; x <= WEP_CONFIG_COUNT; ++x) { WEP_CONFIG_WRITETOFILE(config_queue[x]); }
 		WEP_CONFIG_WRITETOFILE("// }}}\n");
 
 		// step 5: debug info
-		LOG_INFO(sprintf("#%d: %s: %d settings...\n", i, WEP_NAME(i), WEP_CONFIG_COUNT));
+		LOG_INFO(sprintf("#%d: %s: %d settings...\n", i, it.m_name, WEP_CONFIG_COUNT));
+		totalweapons += 1;
 		totalsettings += WEP_CONFIG_COUNT;
-	}
+	});
 
 	// clear queue now that we're finished
 	WEP_CONFIG_COUNT = 0;
-	for(x = 0; x <= MAX_WEP_CONFIG; ++x)
-		{ wep_config_queue[x] = string_null; }
+	for(int x = 0; x <= MAX_CONFIG_SETTINGS; ++x)
+		config_queue[x] = string_null;
 
 	// extra information
-	LOG_INFO(sprintf("Totals: %d weapons, %d settings\n", (i - 1), totalsettings));
+	LOG_INFO(sprintf("Totals: %d weapons, %d settings\n", totalweapons, totalsettings));
 }