X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fradarmap.qc;h=8c15819e05ad174a0ea24f09e573b92061554048;hb=e95082e3dbb7cb2b54189dc05fb923c768babad7;hp=45a4cc7f270c09df18ff79e59aa11ce3d20efd77;hpb=1bc3ab0285f65c7ed0c75cbba00da2460921c973;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc
index 45a4cc7f2..8c15819e0 100644
--- a/qcsrc/server/command/radarmap.qc
+++ b/qcsrc/server/command/radarmap.qc
@@ -2,7 +2,6 @@
 #include "radarmap.qh"
 #include "../_all.qh"
 
-#include "../g_subs.qh"
 #include "../g_world.qh"
 
 #include "../../common/util.qh"
@@ -46,7 +45,7 @@ float FullTraceFraction(vector a, vector mi, vector ma, vector b)
 	}
 
 	if(n > 200)
-		dprint("HOLY SHIT! FullTraceFraction: ", ftos(n), " total traces, ", ftos(m), " iterations\n");
+		LOG_TRACE("HOLY SHIT! FullTraceFraction: ", ftos(n), " total traces, ", ftos(m), " iterations\n");
 
 	return white / (black + white);
 }
@@ -228,7 +227,7 @@ void RadarMap_Next()
 	radarmapper = world;
 }
 void RadarMap_Think()
-{
+{SELFPARAM();
 	// rough map entity
 	//   cnt: current line
 	//   size: pixel width/height
@@ -246,7 +245,7 @@ void RadarMap_Think()
 		self.maxs_x = (mi_picmax.x - mi_picmin.x) / self.size.x;
 		self.maxs_y = (mi_picmax.y - mi_picmin.y) / self.size.y;
 		self.maxs_z = mi_max.z - mi_min.z;
-		print("Picture mins/maxs: ", ftos(self.maxs.x), " and ", ftos(self.maxs.y), " should match\n");
+		LOG_INFO("Picture mins/maxs: ", ftos(self.maxs.x), " and ", ftos(self.maxs.y), " should match\n");
 		self.netname = strzone(strcat("gfx/", mi_shortname, "_radar.xpm"));
 		if(!(self.count & 1))
 		{
@@ -267,7 +266,7 @@ void RadarMap_Think()
 			{
 				fclose(self.cnt);
 
-				print(self.netname, " already exists, aborting (you may want to specify --force)\n");
+				LOG_INFO(self.netname, " already exists, aborting (you may want to specify --force)\n");
 				RadarMap_Next();
 				return;
 			}
@@ -275,12 +274,12 @@ void RadarMap_Think()
 		self.cnt = fopen(self.netname, FILE_WRITE);
 		if(self.cnt < 0)
 		{
-			print("Error writing ", self.netname, "\n");
+			LOG_INFO("Error writing ", self.netname, "\n");
 			remove(self);
 			radarmapper = world;
 			return;
 		}
-		print("Writing to ", self.netname, "...\n");
+		LOG_INFO("Writing to ", self.netname, "...\n");
 		fputs(self.cnt, "/* XPM */\n");
 		fputs(self.cnt, "static char *RadarMap[] = {\n");
 		fputs(self.cnt, "/* columns rows colors chars-per-pixel */\n");
@@ -348,7 +347,7 @@ void RadarMap_Think()
 			else
 			{
 				fputs(self.cnt, "\",\n");
-				print(ftos(self.size.y - self.frame), " lines left\n");
+				LOG_INFO(ftos(self.size.y - self.frame), " lines left\n");
 			}
 		}
 
@@ -368,7 +367,7 @@ void RadarMap_Think()
 			else
 			{
 				fputs(self.cnt, "\",\n");
-				print(ftos(self.size.y - self.frame), " lines left\n");
+				LOG_INFO(ftos(self.size.y - self.frame), " lines left\n");
 			}
 		}
 
@@ -380,7 +379,7 @@ void RadarMap_Think()
 		// close the file
 		fputs(self.cnt, "};\n");
 		fclose(self.cnt);
-		print("Finished. Please edit data/", self.netname, " with an image editing application and place it in the TGA format in the gfx folder.\n");
+		LOG_INFO("Finished. Please edit data/", self.netname, " with an image editing application and place it in the TGA format in the gfx folder.\n");
 		RadarMap_Next();
 	}
 }
@@ -426,7 +425,7 @@ float RadarMap_Make(float argc)
 
 		if(radarmapper) // after doing the arguments, see if we successfully went forward.
 		{
-			print("Radarmap entity spawned.\n");
+			LOG_INFO("Radarmap entity spawned.\n");
 			return true; // if so, don't print usage.
 		}
 	}