X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qc;h=d3b3e46d73526d230e87fe3da69a82f366833f18;hp=970a681e37b202f9bfc2a49c6f2c6377b0a13715;hb=fc15d72b041c9a748b605ba28735380fbe5b5b01;hpb=e9815ad279dc61506e5e65c34348fa7dcc570b9e

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 970a681e3..d3b3e46d7 100644
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -124,7 +124,7 @@ entity GetTeam(int Team, bool add)
 	if(teamslots[num])
 		return teamslots[num];
 	if (!add)
-		return world;
+		return NULL;
 	entity tm = new_pure(team);
 	tm.team = Team;
 	teamslots[num] = tm;
@@ -224,6 +224,10 @@ void drawborderlines(float thickness, vector pos, vector dim, vector color, floa
 
 void drawpic_tiled(vector pos, string pic, vector sz, vector area, vector color, float theAlpha, float drawflag)
 {
+	pos = HUD_Shift(pos);
+	sz = HUD_Scale(sz);
+	area = HUD_Scale(area);
+
 	vector current_pos = '0 0 0', end_pos, new_size = '0 0 0', ratio = '0 0 0';
 	end_pos = pos + area;
 
@@ -258,6 +262,43 @@ void drawpic_aspect_skin_expanding_two(vector position, string pic, vector theSc
 	drawpic_skin(position, pic, theScale, rgb, theAlpha * fadelerp, flag);
 }
 
+void HUD_Scale_Disable()
+{
+	hud_scale = '1 1 0';
+	hud_shift = '0 0 0';
+	drawfontscale = hud_scale;
+}
+
+void HUD_Scale_Enable()
+{
+	hud_scale = hud_scale_current;
+	hud_shift = hud_shift_current;
+	drawfontscale = hud_scale;
+}
+
+vector HUD_Scale(vector v)
+{
+	v.x = HUD_ScaleX(v.x);
+	v.y = HUD_ScaleY(v.y);
+	return v;
+}
+
+vector HUD_Shift(vector v)
+{
+	v.x = HUD_ShiftX(v.x);
+	v.y = HUD_ShiftY(v.y);
+	return v;
+}
+
+float stringwidth(string text, float handleColors, vector sz)
+{
+	vector dfs = drawfontscale;
+	drawfontscale = '1 1 0';
+	float r = stringwidth_builtin(text, handleColors, sz);
+	drawfontscale = dfs;
+	return r;
+}
+
 // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box
 void drawstring_aspect(vector pos, string text, vector sz, vector color, float theAlpha, float drawflag) {
 	SET_POS_AND_SZ_Y_ASPECT(false);
@@ -275,12 +316,16 @@ void drawstring_expanding(vector position, string text, vector theScale, vector
 	float sz;
 	sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
 
+	drawfontscale = hud_scale * sz;
+	vector dfs = drawfontscale;
 	drawfontscale = sz * '1 1 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);
+	float textaspect = stringwidth_builtin(text, false, theScale * (sz / drawfontscale.x)) / (theScale.x * sz);
+	drawfontscale = dfs;
+	drawstring(position + expandingbox_resize_centered_box_offset(sz, theScale, textaspect), text, HUD_Scale(theScale * (sz / drawfontscale.x)), rgb, theAlpha * (1 - fadelerp), flag);
 	// width parameter:
-	//    (scale_x * sz / drawfontscale_x) * drawfontscale_x * SIZE1 / (scale_x * sz)
+	//    (scale_x * sz / drawfontscale.x) * drawfontscale.x * SIZE1 / (scale_x * sz)
 	//    SIZE1
-	drawfontscale = '1 1 0';
+	drawfontscale = hud_scale;
 }
 
 // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box
@@ -294,9 +339,10 @@ void drawcolorcodedstring_expanding(vector position, string text, vector theScal
 	float sz;
 	sz = expandingbox_sizefactor_from_fadelerp(fadelerp);
 
-	drawfontscale = sz * '1 1 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';
+	drawfontscale = hud_scale * sz;
+	// eventually replace with drawcolorcodedstring
+	drawcolorcodedstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth_builtin(text, true, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), theAlpha * (1 - fadelerp), flag);
+	drawfontscale = hud_scale;
 }
 
 void drawcolorcodedstring_aspect_expanding(vector pos, string text, vector sz, float theAlpha, float drawflag, float fadelerp) {