X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fconfig.qc;h=effabeac275ded29fed4b17d370f6e56e7cd5fb2;hb=0c6b993abfdde30411dc771643b8d25b8377cb50;hp=e052d6c1cfcf33dbdc1f388c2eb5aa732bfbb542;hpb=267433aa7d5dd80399b808f692b8bc1ef75f0851;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/turrets/config.qc b/qcsrc/common/turrets/config.qc
index e052d6c1c..effabeac2 100644
--- a/qcsrc/common/turrets/config.qc
+++ b/qcsrc/common/turrets/config.qc
@@ -1,12 +1,15 @@
+#include "config.qh"
 // ==========================
 //  Turret Config Generator
 // ==========================
 
+#ifdef SVQC
+
 void T_Config_Queue_Swap(float root, float child, entity pass)
 {
-	string oldroot = tur_config_queue[root];
-	tur_config_queue[root] = tur_config_queue[child];
-	tur_config_queue[child] = oldroot;
+	string oldroot = config_queue[root];
+	config_queue[root] = config_queue[child];
+	config_queue[child] = oldroot;
 }
 
 float T_Config_Queue_Compare(float root, float child, entity pass)
@@ -15,8 +18,8 @@ float T_Config_Queue_Compare(float root, float child, entity pass)
 
 	for(i = 1; i <= 100; ++i)
 	{
-		r = str2chr(tur_config_queue[root], i);
-		c = str2chr(tur_config_queue[child], i);
+		r = str2chr(config_queue[root], i);
+		c = str2chr(config_queue[child], i);
 		if(r == c) { continue; }
 		else if(c > r) { return -1; }
 		else { return 1; }
@@ -25,37 +28,39 @@ float T_Config_Queue_Compare(float root, float child, entity pass)
 	return 0;
 }
 
-void Dump_Turret_Settings(void)
+void Dump_Turret_Settings()
 {
-	float x, totalsettings = 0;
-	FOREACH(turret_info, it != TUR_Null, LAMBDA({
+	int totalsettings = 0;
+	FOREACH(Turrets, it != TUR_Null, {
 		// step 1: clear the queue
 		TUR_CONFIG_COUNT = 0;
-		for(x = 0; x <= MAX_TUR_CONFIG; ++x)
-			{ tur_config_queue[x] = string_null; }
+		for(int j = 0; j <= MAX_CONFIG_SETTINGS; ++j)
+			config_queue[j] = string_null;
 
 		// step 2: build new queue
 		it.tr_config(it);
 
 		// step 3: sort queue
-		heapsort(TUR_CONFIG_COUNT, T_Config_Queue_Swap, T_Config_Queue_Compare, world);
+		heapsort(TUR_CONFIG_COUNT, T_Config_Queue_Swap, T_Config_Queue_Compare, NULL);
 
 		// step 4: write queue
 		TUR_CONFIG_WRITETOFILE(sprintf("// {{{ #%d: %s\n", i, it.turret_name))
-		for(x = 0; x <= TUR_CONFIG_COUNT; ++x)
-			{ TUR_CONFIG_WRITETOFILE(tur_config_queue[x]) }
+		for(int j = 0; j <= TUR_CONFIG_COUNT; ++j)
+			TUR_CONFIG_WRITETOFILE(config_queue[j])
 		TUR_CONFIG_WRITETOFILE("// }}}\n")
 
 		// step 5: debug info
-		LOG_INFO(sprintf("#%d: %s: %d settings...\n", i, it.turret_name, TUR_CONFIG_COUNT));
+		LOG_INFOF("#%d: %s: %d settings...", i, it.turret_name, TUR_CONFIG_COUNT);
 		totalsettings += TUR_CONFIG_COUNT;
-	}));
+	});
 
 	// clear queue now that we're finished
 	TUR_CONFIG_COUNT = 0;
-	for(x = 0; x <= MAX_TUR_CONFIG; ++x)
-		{ tur_config_queue[x] = string_null; }
+	for(int j = 0; j <= MAX_CONFIG_SETTINGS; ++j)
+		config_queue[j] = string_null;
 
 	// extra information
-	LOG_INFO(sprintf("Totals: %d turrets, %d settings\n", (TUR_COUNT - 1), totalsettings));
+	LOG_INFOF("Totals: %d turrets, %d settings", (Turrets_COUNT - 1), totalsettings);
 }
+
+#endif