X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qc;h=91d68f1ba1313cb0a7eb543dd7b6406fafd26d7e;hp=d83871080d1f19167fd803096f8ef03efd2cb11f;hb=2f215c603bf1b4dd44b9d166180f535c88602e9f;hpb=429e52163f53e75b848135f076b77c4eb43935ac

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index d83871080d..91d68f1ba1 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -24,10 +24,9 @@
 */
 vector real_origin(entity ent)
 {
-	entity e;
 	vector v = ((ent.absmin + ent.absmax) * 0.5);
+	entity e = ent.tag_entity;
 
-	e = ent.tag_entity;
 	while(e)
 	{
 		v = v + ((e.absmin + e.absmax) * 0.5);
@@ -326,7 +325,7 @@ float compressShortVector(vector vec)
 STATIC_INIT(compressShortVector)
 {
 	float l = 1;
-	float f = pow(2, 1/8);
+	float f = (2 ** (1/8));
 	int i;
 	for(i = 0; i < 128; ++i)
 	{
@@ -414,11 +413,11 @@ string fixPriorityList(string order, float from, float to, float subtract, float
 string mapPriorityList(string order, string(string) mapfunc)
 {
 	string neworder;
-	float i, n;
+	float n;
 
 	n = tokenize_console(order);
 	neworder = "";
-	for(i = 0; i < n; ++i)
+	for(float i = 0; i < n; ++i)
 		neworder = strcat(neworder, mapfunc(argv(i)), " ");
 
 	return substring(neworder, 0, strlen(neworder) - 1);
@@ -426,15 +425,12 @@ string mapPriorityList(string order, string(string) mapfunc)
 
 string swapInPriorityList(string order, float i, float j)
 {
-	string s;
-	float w, n;
-
-	n = tokenize_console(order);
+	float n = tokenize_console(order);
 
 	if(i >= 0 && i < n && j >= 0 && j < n && i != j)
 	{
-		s = "";
-		for(w = 0; w < n; ++w)
+		string s = "";
+		for(float w = 0; w < n; ++w)
 		{
 			if(w == i)
 				s = strcat(s, argv(j), " ");
@@ -672,7 +668,6 @@ bool isCaretEscaped(string theText, float pos)
 
 int skipIncompleteTag(string theText, float pos, int len)
 {
-	int i = 0, ch = 0;
 	int tag_start = -1;
 
 	if(substring(theText, pos - 1, 1) == "^")
@@ -680,7 +675,7 @@ int skipIncompleteTag(string theText, float pos, int len)
 		if(isCaretEscaped(theText, pos - 1) || pos >= len)
 			return 0;
 
-		ch = str2chr(theText, pos);
+		int ch = str2chr(theText, pos);
 		if(ch >= '0' && ch <= '9')
 			return 1; // ^[0-9] color code found
 		else if (ch == 'x')
@@ -690,7 +685,7 @@ int skipIncompleteTag(string theText, float pos, int len)
 	}
 	else
 	{
-		for(i = 2; pos - i >= 0 && i <= 4; ++i)
+		for(int i = 2; pos - i >= 0 && i <= 4; ++i)
 		{
 			if(substring(theText, pos - i, 2) == "^x")
 			{
@@ -784,8 +779,7 @@ string find_last_color_code(string s)
 	if (start == -1) // no caret found
 		return "";
 	int len = strlen(s)-1;
-	int i;
-	for(i = len; i >= start; --i)
+	for(int i = len; i >= start; --i)
 	{
 		if(substring(s, i, 1) != "^")
 			continue;
@@ -1078,17 +1072,17 @@ float compressShotOrigin(vector v)
 	float rz = rint(v.z * 4) + 128;
 	if(rx > 255 || rx < 0)
 	{
-		LOG_INFO("shot origin ", vtos(v), " x out of bounds\n");
+		LOG_DEBUG("shot origin ", vtos(v), " x out of bounds\n");
 		rx = bound(0, rx, 255);
 	}
 	if(ry > 255 || ry < 0)
 	{
-		LOG_INFO("shot origin ", vtos(v), " y out of bounds\n");
+		LOG_DEBUG("shot origin ", vtos(v), " y out of bounds\n");
 		ry = bound(0, ry, 255);
 	}
 	if(rz > 255 || rz < 0)
 	{
-		LOG_INFO("shot origin ", vtos(v), " z out of bounds\n");
+		LOG_DEBUG("shot origin ", vtos(v), " z out of bounds\n");
 		rz = bound(0, rz, 255);
 	}
 	return rx * 0x10000 + ry * 0x100 + rz;