X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fclient%2Fhud.qc;fp=data%2Fqcsrc%2Fclient%2Fhud.qc;h=25aa1a8521036fbe58eed95ad21ada7132c5c992;hb=2cdb4fc5e3f6896946e69f359b0aece840c849ce;hp=c70501497f27be29dfbcc88a7dcee9a6d4050a3d;hpb=bc84d94d3716372fd6c1ea49ab9cf52badad0d4a;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/client/hud.qc b/data/qcsrc/client/hud.qc
index c7050149..25aa1a85 100644
--- a/data/qcsrc/client/hud.qc
+++ b/data/qcsrc/client/hud.qc
@@ -94,7 +94,7 @@ vector Sbar_ConvertToScreen_TextPosition(string text, vector position, float let
 	vector pos, sz;
 	sz_x = sz_y = lettersize;
 	pos_x = (vid_conwidth / 2) * bound(0, 1 + position_x, 2);
-	pos_x -= stringwidth(text, FALSE, sz) * 0.5;
+	pos_x -= stringwidth(text, TRUE, sz) * 0.5;
 	pos_y = (vid_conheight / 2) * bound(0, 1 - position_y, 2);
 	pos_y -= sz_y / 2;
 	return pos;
@@ -123,7 +123,7 @@ void Sbar_DrawString(string text, vector position, float lettersize)
 	pos = Sbar_ConvertToScreen_TextPosition(text, position, lettersize);
 	sz_x = sz_y = lettersize;
 
-	drawstring(pos, text, sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+	drawcolorcodedstring(pos, text, sz, sbar_alpha_fg, DRAWFLAG_NORMAL);
 }
 
 void Sbar_DrawXNum (vector position, float num, float digits, float showminusplus, float lettersize, vector rgb, float alpha, float dflags)
@@ -2170,9 +2170,9 @@ void Sbar_Status()
 				{
 					weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);
 					if(weapon_clipload < 0) // we're reloading
-						Sbar_DrawString("- -", stov(cvar_string("hud_item_clip_load_text_position")), cvar("hud_item_clip_load_text_scale"));
+						Sbar_DrawString("- -", stov(cvar_string("hud_item_ammo_load_clip_text_position")), cvar("hud_item_ammo_load_clip_text_scale"));
 					else
-						Sbar_DrawXNum(stov(cvar_string("hud_item_clip_load_text_position")), weapon_clipload, 2, 0, cvar("hud_item_clip_load_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+						Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_load_clip_text_position")), weapon_clipload, 2, 0, cvar("hud_item_ammo_load_clip_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 					Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_load_text_position")), a, 3, 0, cvar("hud_item_ammo_load_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 				}
 				else
@@ -3278,24 +3278,23 @@ void Sbar_Draw (void)
 			if(stomach_load)
 			{
 				status_text = strcat(ftos(stomach_load), "^8/", status_color, ftos(stomach_maxload));
-				status_pos = bottomleft - '-43 168 0';
-				status_size = 16;
+				status_pos = stov(cvar_string("hud_item_stomach_load_double_text_position"));
+				status_size = cvar("hud_item_stomach_load_double_text_scale");
 			}
 			else
 			{
 				status_text = strcat(status_color, ftos(stomach_maxload));
-				status_pos = bottomleft - '-43 170 0';
-				status_size = 20;
+				status_pos = stov(cvar_string("hud_item_stomach_load_single_text_position"));
+				status_size = cvar("hud_item_stomach_load_single_text_scale");
 			}
-			status_pos -= '1 0 0' * stringwidth(status_text, TRUE, '1 0 0' * status_size) * 0.5;
-			drawcolorcodedstring(status_pos, status_text, '1 1 0' * status_size, sbar_alpha_fg, DRAWFLAG_NORMAL);
+			Sbar_DrawString(status_text, status_pos, status_size);
 
 			if(getstati(STAT_VORE_DIGESTING)) // we are currently digesting
-				drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0 1 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+				Sbar_DrawPic("gfx/hud/sb_digestion_active", stov(cvar_string("hud_item_digestion_icon_position")), stov(cvar_string("hud_item_digestion_icon_scale")), FALSE);
 			else if(stomach_load) // we can digest at this time
-				drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0.25 0.25 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+				Sbar_DrawPic("gfx/hud/sb_digestion_possible", stov(cvar_string("hud_item_digestion_icon_position")), stov(cvar_string("hud_item_digestion_icon_scale")), FALSE);
 			else // we cannot digest at this time
-				drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0.25 0 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+				Sbar_DrawPic("gfx/hud/sb_digestion_impossible", stov(cvar_string("hud_item_digestion_icon_position")), stov(cvar_string("hud_item_digestion_icon_scale")), FALSE);
 
 			// draw the stomach board player list
 			entity pl, pred;