X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qc;h=d04fdecd68dc791f05a8fe93878ed0e6185822b4;hb=b9671f63469586007314131f3f53728795c035cd;hp=ec643fcb5885cac7d20ccd0cfe0cf16b93b6ea80;hpb=35528e99ccad9a20fbd6eed640a5bc1bda884acd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index ec643fcb5..d04fdecd6 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -57,22 +57,25 @@ string wordwrap(string s, float l)
 
 #ifndef MENUQC
 #ifndef CSQC
+entity _wordwrap_buffer_sprint_ent;
 void wordwrap_buffer_sprint(string s)
-{SELFPARAM();
+{
 	wordwrap_buffer = strcat(wordwrap_buffer, s);
 	if(s == "\n")
 	{
-		sprint(self, wordwrap_buffer);
+		sprint(_wordwrap_buffer_sprint_ent, wordwrap_buffer);
 		wordwrap_buffer = "";
 	}
 }
 
-void wordwrap_sprint(string s, float l)
-{SELFPARAM();
+void wordwrap_sprint(entity to, string s, float l)
+{
 	wordwrap_buffer = "";
+	_wordwrap_buffer_sprint_ent = to;
 	wordwrap_cb(s, l, wordwrap_buffer_sprint);
+	_wordwrap_buffer_sprint_ent = NULL;
 	if(wordwrap_buffer != "")
-		sprint(self, strcat(wordwrap_buffer, "\n"));
+		sprint(to, strcat(wordwrap_buffer, "\n"));
 	wordwrap_buffer = "";
 	return;
 }
@@ -294,7 +297,7 @@ float compressShortVector(vector vec)
 {
 	vector ang;
 	float p, y, len;
-	if(vlen(vec) == 0)
+	if(vec == '0 0 0')
 		return 0;
 	//print("compress: ", vtos(vec), "\n");
 	ang = vectoangles(vec);
@@ -486,7 +489,7 @@ void get_mi_min_max(float mode)
 					 '0 1 0' * ma.y + '0 0 1' * ma.z,
 					 '1 0 0' * ma.x,
 					 MOVE_WORLDONLY,
-					 world);
+					 NULL);
 			if(!trace_startsolid)
 				mi_min.x = trace_endpos.x;
 
@@ -495,7 +498,7 @@ void get_mi_min_max(float mode)
 					 '1 0 0' * ma.x + '0 0 1' * ma.z,
 					 '0 1 0' * ma.y,
 					 MOVE_WORLDONLY,
-					 world);
+					 NULL);
 			if(!trace_startsolid)
 				mi_min.y = trace_endpos.y;
 
@@ -504,7 +507,7 @@ void get_mi_min_max(float mode)
 					 '1 0 0' * ma.x + '0 1 0' * ma.y,
 					 '0 0 1' * ma.z,
 					 MOVE_WORLDONLY,
-					 world);
+					 NULL);
 			if(!trace_startsolid)
 				mi_min.z = trace_endpos.z;
 
@@ -513,7 +516,7 @@ void get_mi_min_max(float mode)
 					 '0 1 0' * ma.y + '0 0 1' * ma.z,
 					 '1 0 0' * mi.x,
 					 MOVE_WORLDONLY,
-					 world);
+					 NULL);
 			if(!trace_startsolid)
 				mi_max.x = trace_endpos.x;
 
@@ -522,7 +525,7 @@ void get_mi_min_max(float mode)
 					 '1 0 0' * ma.x + '0 0 1' * ma.z,
 					 '0 1 0' * mi.y,
 					 MOVE_WORLDONLY,
-					 world);
+					 NULL);
 			if(!trace_startsolid)
 				mi_max.y = trace_endpos.y;
 
@@ -531,7 +534,7 @@ void get_mi_min_max(float mode)
 					 '1 0 0' * ma.x + '0 1 0' * ma.y,
 					 '0 0 1' * mi.z,
 					 MOVE_WORLDONLY,
-					 world);
+					 NULL);
 			if(!trace_startsolid)
 				mi_max.z = trace_endpos.z;
 		}
@@ -640,7 +643,7 @@ int cvar_settemp_restore()
 	});
 
 #else
-	entity e = world;
+	entity e = NULL;
 	while((e = find(e, classname, "saved_cvar_value")))
 	{
 		if(cvar_type(e.netname))
@@ -1433,7 +1436,7 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t
 
 	// start with a 1-element queue
 	queue_start = queue_end = e;
-	queue_end.(fld) = world;
+	queue_end.(fld) = NULL;
 	queue_end.FindConnectedComponent_processing = 1;
 
 	// for each queued item:
@@ -1441,7 +1444,7 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t
 	{
 		// find all neighbors of queue_start
 		entity t;
-		for(t = world; (t = nxt(t, queue_start, pass)); )
+		for(t = NULL; (t = nxt(t, queue_start, pass)); )
 		{
 			if(t.FindConnectedComponent_processing)
 				continue;
@@ -1450,7 +1453,7 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t
 				// it is connected? ADD IT. It will look for neighbors soon too.
 				queue_end.(fld) = t;
 				queue_end = t;
-				queue_end.(fld) = world;
+				queue_end.(fld) = NULL;
 				queue_end.FindConnectedComponent_processing = 1;
 			}
 		}