X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fconfig.qc;h=7f87388db13b3b1964a360597b45ea013b28373b;hb=acddeee8ad8acd0099fdd25d5049e302d6246f24;hp=34031a208b830082211296cdb3661f7d7c1bdb05;hpb=6f4c7132e635c0150e3894f2f9958b361ce0c238;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc
index 34031a208..7f87388db 100644
--- a/qcsrc/common/weapons/config.qc
+++ b/qcsrc/common/weapons/config.qc
@@ -1,8 +1,8 @@
+#include "config.qh"
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include "../util.qh"
-    #include "config.qh"
     #include "all.qh"
 #endif
 
@@ -12,14 +12,14 @@
 
 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()
@@ -28,14 +28,14 @@ void Dump_Weapon_Settings()
 	FOREACH(Weapons, it != WEP_Null, {
 		// step 1: clear the queue
 		WEP_CONFIG_COUNT = 0;
-		for (int 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
 		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(
@@ -44,7 +44,7 @@ void Dump_Weapon_Settings()
 			it.m_name,
 			((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) ? " (MUTATOR WEAPON)" : "")
 		));
-		for (int 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
@@ -55,8 +55,8 @@ void Dump_Weapon_Settings()
 
 	// clear queue now that we're finished
 	WEP_CONFIG_COUNT = 0;
-	for(int 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", totalweapons, totalsettings));