X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qc;h=ab4cb1f15673c6c952872e83e22f2048c3b15237;hb=43eba8ca70f00458db385630f86009f6d7fa849a;hp=845a5641067df16b639e047090b8b03b98e452f9;hpb=fc2be4c1e7547ae97301f7966333e4dc858baf92;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 845a56410..ab4cb1f15 100644
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -1,18 +1,13 @@
 #include "miscfunctions.qh"
-#include "_all.qh"
 
-#include "hud.qh"
-#include "sortlist.qh"
+#include "hud/all.qh"
 
 #include "../common/command/generic.qh"
 
 #include "../common/teams.qh"
-#include "../common/urllib.qh"
-#include "../common/util.qh"
 
-#include "../csqcmodellib/cl_model.qh"
+#include "../lib/csqcmodel/cl_model.qh"
 
-#include "../warpzonelib/mathlib.qh"
 
 void AuditLists()
 {
@@ -110,7 +105,7 @@ void RemoveTeam(entity Team)
 
 	if(!tm)
 	{
-		print(_("Trying to remove a team which is not in the teamlist!"));
+		LOG_INFO(_("Trying to remove a team which is not in the teamlist!"));
 		return;
 	}
 	parent.sort_next = Team.sort_next;
@@ -128,7 +123,8 @@ entity GetTeam(int Team, bool add)
 		return teamslots[num];
 	if (!add)
 		return world;
-	entity tm = spawn();
+	entity tm = new(team);
+	make_pure(tm);
 	tm.team = Team;
 	teamslots[num] = tm;
 	RegisterTeam(tm);
@@ -160,23 +156,6 @@ float PreviewExists(string name)
 	return false;
 }
 
-vector rotate(vector v, float a)
-{
-	vector w = '0 0 0';
-	// FTEQCC SUCKS AGAIN
-	w.x =      v.x * cos(a) + v.y * sin(a);
-	w.y = -1 * v.x * sin(a) + v.y * cos(a);
-	return w;
-}
-
-string ColorTranslateRGB(string s)
-{
-	if(ColorTranslateMode & 1)
-		return strdecolorize(s);
-	else
-		return s;
-}
-
 // decolorizes and team colors the player name when needed
 string playername(string thename, float teamid)
 {
@@ -211,10 +190,6 @@ vector project_3d_to_2d(vector vec)
 	return vec;
 }
 
-void dummyfunction(float a1, float a2, float a3, float a4, float a5, float a6, float a7, float a8)
-{
-}
-
 float expandingbox_sizefactor_from_fadelerp(float fadelerp)
 {
 	return 1.2 / (1.2 - fadelerp);
@@ -299,7 +274,6 @@ void drawstring_expanding(vector position, string text, vector theScale, vector
 	sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
 
 	drawfontscale = sz * '1 1 0';
-	dummyfunction(0, 0, 0, 0, 0, 0, 0, 0);
 	drawstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, false, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), rgb, theAlpha * (1 - fadelerp), flag);
 	// width parameter:
 	//    (scale_x * sz / drawfontscale_x) * drawfontscale_x * SIZE1 / (scale_x * sz)
@@ -319,7 +293,6 @@ void drawcolorcodedstring_expanding(vector position, string text, vector theScal
 	sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
 
 	drawfontscale = sz * '1 1 0';
-	dummyfunction(0, 0, 0, 0, 0, 0, 0, 0);
 	drawcolorcodedstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, true, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), theAlpha * (1 - fadelerp), flag);
 	drawfontscale = '1 1 0';
 }
@@ -560,6 +533,7 @@ float getplayerisdead(float pl)
 	return false;
 }
 
+/** engine callback */
 void URI_Get_Callback(int id, float status, string data)
 {
 	if(url_URI_Get_Callback(id, status, data))
@@ -577,20 +551,10 @@ void URI_Get_Callback(int id, float status, string data)
 	}
 	else
 	{
-		printf("Received HTTP request data for an invalid id %d.\n", id);
+		LOG_INFOF("Received HTTP request data for an invalid id %d.\n", id);
 	}
 }
 
-void draw_beginBoldFont()
-{
-	drawfont = FONT_USER+2;
-}
-
-void draw_endBoldFont()
-{
-	drawfont = FONT_USER+1;
-}
-
 void Accuracy_LoadLevels()
 {
 	if(autocvar_accuracy_color_levels != acc_color_levels)
@@ -602,7 +566,7 @@ void Accuracy_LoadLevels()
 		if(acc_levels > MAX_ACCURACY_LEVELS)
 			acc_levels = MAX_ACCURACY_LEVELS;
 		if(acc_levels < 2)
-			print("Warning: accuracy_color_levels must contain at least 2 values\n");
+			LOG_INFO("Warning: accuracy_color_levels must contain at least 2 values\n");
 
 		int i;
 		for(i = 0; i < acc_levels; ++i)