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

diff --git a/data/qcsrc/client/hud.qc b/data/qcsrc/client/hud.qc
index 4406129b..c7050149 100644
--- a/data/qcsrc/client/hud.qc
+++ b/data/qcsrc/client/hud.qc
@@ -33,20 +33,6 @@ float ts_primary, ts_secondary;
 
 vector color;
 
-vector Sbar_Edge(string str)
-{
-	vector pos;
-	switch(str)
-	{
-		case "bottom":
-			pos_x = vid_conwidth / 2;
-			pos_y = vid_conheight;
-		default:
-			break;
-	}
-	return pos;
-}
-
 void CSQC_kh_hudreset();
 void CSQC_kh_hud();
 void CSQC_ctf_hudreset();
@@ -86,15 +72,65 @@ vector Sbar_AccuracyColor(float accuracy)
 	return rgb;
 }
 
-void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, float lettersize, vector rgb, float alpha, float dflags)
+vector Sbar_ConvertToScreen_PicScale(vector dimensions)
+{
+	vector sz;
+	sz_x = vid_conwidth * dimensions_x;
+	sz_y = vid_conheight * dimensions_y;
+	return sz;
+}
+vector Sbar_ConvertToScreen_PicPosition(vector position, vector dimensions)
+{
+	vector pos, sz;
+	sz = Sbar_ConvertToScreen_PicScale(dimensions);
+	pos_x = (vid_conwidth / 2) * bound(0, 1 + position_x, 2);
+	pos_x -= sz_x / 2;
+	pos_y = (vid_conheight / 2) * bound(0, 1 - position_y, 2);
+	pos_y -= sz_y / 2;
+	return pos;
+}
+vector Sbar_ConvertToScreen_TextPosition(string text, vector position, float lettersize)
+{
+	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_y = (vid_conheight / 2) * bound(0, 1 - position_y, 2);
+	pos_y -= sz_y / 2;
+	return pos;
+}
+
+void Sbar_DrawPic(string pic, vector position, vector dimensions, float background)
+{
+	vector pos, sz;
+	pos = Sbar_ConvertToScreen_PicPosition(position, dimensions);
+	sz = Sbar_ConvertToScreen_PicScale(dimensions);
+
+	if(background)
+	{
+		if(teamplay)
+			drawpic(pos, pic, sz, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color
+		else
+			drawpic(pos, pic, sz, stov(cvar_string("sbar_color_bg")), sbar_alpha_bg, DRAWFLAG_NORMAL);
+	}
+	else
+		drawpic(pos, pic, sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+}
+
+void Sbar_DrawString(string text, vector position, float lettersize)
+{
+	vector pos, sz;
+	pos = Sbar_ConvertToScreen_TextPosition(text, position, lettersize);
+	sz_x = sz_y = lettersize;
+
+	drawstring(pos, text, sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+}
+
+void Sbar_DrawXNum (vector position, float num, float digits, float showminusplus, float lettersize, vector rgb, float alpha, float dflags)
 {
 	float l;
 	string str, tmp, l_length, final_num;
 	float minus, plus;
-	vector vsize;
-
-	vsize_x = vsize_y = lettersize;
-	vsize_z = 0;
 
 	// showminusplus 1: always prefix with minus sign (useful in race distribution display)
 	// showminusplus 2: always prefix with plus sign (useful in race distribution display)
@@ -134,9 +170,13 @@ void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, fl
 		final_num = "-";
 	else if(plus)
 		final_num = "+";
-
 	final_num = strcat(final_num, str);
-	drawstring(pos, final_num, vsize, rgb, alpha, dflags);
+
+	vector pos, sz;
+	pos = Sbar_ConvertToScreen_TextPosition(final_num, position, lettersize);
+	sz_x = sz_y = lettersize;
+
+	drawstring(pos, final_num, sz, rgb, alpha, dflags);
 }
 
 vector Sbar_NumColor (float x)
@@ -723,6 +763,44 @@ string Sbar_GetStomachFieldPred(entity pl, float field)
 	//return "error";
 }
 
+vector Sbar_GetVoreColor()
+{
+	// gets color based on vore status
+	if(getstati(STAT_VORE_EATEN))
+	{
+		if(teamplay && (GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(spectatee_status - 1))) // same team
+			return stov(cvar_string("sbar_stomachboard_color2"));
+		else
+			return stov(cvar_string("sbar_stomachboard_color3"));
+	}
+	else
+		return stov(cvar_string("sbar_stomachboard_color1"));
+}
+
+vector colorfade_current;
+vector Sbar_ColorFade(vector target_color)
+{
+	local float step;
+	step = cvar("sbar_stomachboard_status_fade") * frametime;
+
+	if(colorfade_current_x >= target_color_x + step)
+		colorfade_current_x -= step;
+	else if(colorfade_current_x <= target_color_x - step)
+		colorfade_current_x += step;
+
+	if(colorfade_current_y >= target_color_y + step)
+		colorfade_current_y -= step;
+	else if(colorfade_current_y <= target_color_y - step)
+		colorfade_current_y += step;
+
+	if(colorfade_current_z >= target_color_z + step)
+		colorfade_current_z -= step;
+	else if(colorfade_current_z <= target_color_z - step)
+		colorfade_current_z += step;
+
+	return colorfade_current;
+}
+
 float xmin, xmax, ymin, ymax, sbwidth;
 float sbar_fixscoreboardcolumnwidth_len;
 float sbar_fixscoreboardcolumnwidth_iconlen;
@@ -927,83 +1005,111 @@ void Sbar_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_num
 	}
 }
 
-float fieldcounter;
-void Sbar_PrintStomachboardItem(vector pos, entity pl)
+void Sbar_PrintStomachboardItem(entity pl, vector position, vector dimensions)
 {
 	// lists all players in the stomach
 
 	string str;
 	float f, field, field_number;
-	vector hl_color;
 	field_number = 3; // the number of components each row has
 
+	position = Sbar_ConvertToScreen_PicPosition(position, dimensions);
+	dimensions = Sbar_ConvertToScreen_PicScale(dimensions);
+
+	// set font size to the height of each entry
+	vector font_sz;
+	font_sz_x = font_sz_y = dimensions_y;
+
+	float fieldcounter;
 	for(fieldcounter = 1; fieldcounter <= field_number; ++fieldcounter)
 	{
+		vector pos, sz;
 		field = -fieldcounter;
 		str = Sbar_GetStomachField(pl, field);
 
 		// row highlighting
 		if(field == ST_HIGHLIGHT)
 		{
-			if(getstati(STAT_VORE_EATEN))
-			{
-				if(teamplay && (GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(spectatee_status - 1))) // same team
-					hl_color = stov(cvar_string("sbar_stomachboard_color2"));
-				else
-					hl_color = stov(cvar_string("sbar_stomachboard_color3"));
-			}
-			else
-				hl_color = stov(cvar_string("sbar_stomachboard_color1"));
-			drawfill(pos - '0 0 0', '193 11 0', hl_color, cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);
+			pos = position;
+			sz = dimensions;
+
+			drawfill(pos, sz, Sbar_ColorFade(Sbar_GetVoreColor()), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);
 		}
 
 		if(field == ST_NAME) {
+			pos_x = position_x + dimensions_x * cvar("hud_item_preylist_colors_location");
+			sz_x = dimensions_x * cvar("hud_item_preylist_colors_length");
+
 			f = stof(getplayerkey(pl.sv_entnum, "colors"));
-			drawpic(pos, "gfx/sb_playercolor_base", '22 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-			drawpic(pos, "gfx/sb_playercolor_shirt", '22 11 0', colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);
-			drawpic(pos, "gfx/sb_playercolor_pants", '22 11 0', colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);
+			drawpic(pos, "gfx/sb_playercolor_base", sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			drawpic(pos, "gfx/sb_playercolor_shirt", sz, colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);
+			drawpic(pos, "gfx/sb_playercolor_pants", sz, colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);
 
-			pos_x += 24;
-			drawcolorcodedstring(pos, textShortenToWidth(str, 138, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			pos_x = position_x + dimensions_x * cvar("hud_item_preylist_name_location");
+			sz_x = dimensions_x * cvar("hud_item_preylist_name_length");
+			drawcolorcodedstring(pos, textShortenToWidth(str, sz_x, font_sz, stringwidth_colors), font_sz, sbar_alpha_fg, DRAWFLAG_NORMAL);
 		}
 
 		if(field == ST_HEALTH) {
-			pos_x += 138;
-				if(pl.sv_entnum == player_localentnum - 1 || (spectatee_status && pl.sv_entnum == spectatee_status - 1))
-					drawcolorcodedstring(pos, "self", '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
-				else
-				{
-					drawpic(pos, "gfx/hud/sb_health", '11 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			pos_x = position_x + dimensions_x * cvar("hud_item_preylist_health_icon_location");
+			sz_x = dimensions_x * cvar("hud_item_preylist_health_icon_length");
 
-					pos_x += 9;
-						drawcolorcodedstring(pos, str, '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
-				}
+			if(pl.sv_entnum == player_localentnum - 1 || (spectatee_status && pl.sv_entnum == spectatee_status - 1))
+				drawcolorcodedstring(pos, textShortenToWidth("self", sz_x, font_sz, stringwidth_colors), font_sz, sbar_alpha_fg, DRAWFLAG_NORMAL);
+			else
+			{
+				drawpic(pos, "gfx/hud/sb_health", sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+
+				pos_x = position_x + dimensions_x * cvar("hud_item_preylist_health_text_location");
+				sz_x = dimensions_x * cvar("hud_item_preylist_health_text_length");
+				drawcolorcodedstring(pos, textShortenToWidth(str, sz_x, font_sz, stringwidth_colors), font_sz, sbar_alpha_fg, DRAWFLAG_NORMAL);
+			}
 		}
 	}
 }
 
-float fieldcounter2;
-void Sbar_PrintStomachboardItemPred(vector pos, entity pl)
+void Sbar_PrintStomachboardItemPred(entity pl, vector position, vector dimensions)
 {
 	// shows the name of our predator
 
 	string str;
 	float f, field, field_number;
-	field_number = 1; // the number of components each row has
+	field_number = 2; // the number of components each row has
 
-	for(fieldcounter2 = 1; fieldcounter2 <= field_number; ++fieldcounter2)
+	position = Sbar_ConvertToScreen_PicPosition(position, dimensions);
+	dimensions = Sbar_ConvertToScreen_PicScale(dimensions);
+
+	// set font size to the height of each entry
+	vector font_sz;
+	font_sz_x = font_sz_y = dimensions_y;
+
+	float fieldcounter;
+	for(fieldcounter = 1; fieldcounter <= field_number; ++fieldcounter)
 	{
-		field = -fieldcounter2;
+		vector pos, sz;
+		field = -fieldcounter;
 		str = Sbar_GetStomachFieldPred(pl, field);
 
+		// row highlighting
+		if(field == ST_HIGHLIGHT)
+		{
+			pos = position;
+			sz = dimensions;
+
+			drawfill(pos, sz, Sbar_ColorFade(Sbar_GetVoreColor()), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);
+		}
+
 		if(field == STP_NAME) {
+			pos_x = position_x + dimensions_x * cvar("hud_item_predator_colors_location");
+			sz_x = dimensions_x * cvar("hud_item_predator_colors_length");
 			f = stof(getplayerkey(pl.sv_entnum, "colors"));
-			drawpic(pos, "gfx/sb_playercolor_base", '22 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-			drawpic(pos, "gfx/sb_playercolor_shirt", '22 11 0', colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);
-			drawpic(pos, "gfx/sb_playercolor_pants", '22 11 0', colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);
+			drawpic(pos, "gfx/sb_playercolor_base", sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			drawpic(pos, "gfx/sb_playercolor_shirt", sz, colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);
+			drawpic(pos, "gfx/sb_playercolor_pants", sz, colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);
 
-			pos_x += 24;
-			drawcolorcodedstring(pos, textShortenToWidth(str, 122, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			pos_x = position_x + dimensions_x * cvar("hud_item_predator_name_location");
+			sz_x = dimensions_x * cvar("hud_item_predator_name_length");
+			drawcolorcodedstring(pos, textShortenToWidth(str, sz_x, font_sz, stringwidth_colors), font_sz, sbar_alpha_fg, DRAWFLAG_NORMAL);
 		}
 	}
 }
@@ -1530,6 +1636,28 @@ void Sbar_DrawScoreboard()
 	pos_y += 1.2 * sbar_fontsize_y;
 	drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, sbar_fontsize)), str, sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
 
+	// print information about respawn status
+	float respawn_time = getstatf(STAT_RESPAWN_TIME);
+	if(respawn_time)
+	{
+		if(respawn_time < 0)
+		{
+			// a negative number means we are awaiting respawn, time value is still the same
+			respawn_time *= -1; // remove mark now that we checked it
+			if(time >= respawn_time) // don't show a negative value while the server is respawning the player (lag)
+				str = strcat("^1Respawning...");
+			else
+				str = strcat("^1Respawning in ^3", ftos_decimals(respawn_time - time, 2), "^1 seconds...");
+		}
+		else if(time < respawn_time)
+			str = strcat("You are dead, wait ^3", ftos_decimals(respawn_time - time, 2), "^7 seconds before respawning");
+		else if(time >= respawn_time)
+			str = strcat("You are dead, press ^2", getcommandkey("primary fire", "+fire"), "^7 to respawn");
+
+		pos_y += 1.2 * sbar_fontsize_y;
+		drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, sbar_fontsize)), str, sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+	}
+
 	scoreboard_bottom = pos_y + 2 * sbar_fontsize_y;
 }
 
@@ -1994,39 +2122,21 @@ void Sbar_Status()
 	float stat_items;
 	stat_items = getstati(STAT_ITEMS);
 
-	vector edge, pos, pos2;
-	edge = Sbar_Edge(cvar_string("hud_panel_status_edge"));
-
-	pos = edge - stov(cvar_string("hud_panel_status_background_position"));
-	if (cvar("viewsize") <= 100 && sbar_hudselector) {
-		if (teamplay)
-			drawpic(pos, "gfx/hud/bg_status", stov(cvar_string("hud_panel_status_background_scale")), GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color
-		else {
-			// allow for custom HUD colors in non-teamgames
-			color = stov(cvar_string("sbar_color_bg"));
-
-			drawpic(pos, "gfx/hud/bg_status", stov(cvar_string("hud_panel_status_background_scale")), color, sbar_alpha_bg, DRAWFLAG_NORMAL);
-		}
-	}
+	if (cvar("viewsize") <= 100 && sbar_hudselector)
+		Sbar_DrawPic("gfx/hud/bg_status", stov(cvar_string("hud_panel_status_background_position")), stov(cvar_string("hud_panel_status_background_scale")), TRUE);
 
 	// armor
-	pos = edge - stov(cvar_string("hud_panel_status_item_armor_text_position"));
-	pos2 = edge - stov(cvar_string("hud_panel_status_item_armor_icon_position"));
 	x = armor;
 	if (x > 0)
 	{
-		drawpic(pos2, "gfx/hud/sb_armor", stov(cvar_string("hud_panel_status_item_armor_icon_scale")), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-		pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '1 1 0' * cvar("hud_panel_status_item_armor_text_scale")) * 0.5;
-		Sbar_DrawXNum(pos, x, 3, 0, cvar("hud_panel_status_item_armor_text_scale"), Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);
+		Sbar_DrawPic("gfx/hud/sb_armor", stov(cvar_string("hud_item_armor_icon_position")), stov(cvar_string("hud_item_armor_icon_scale")), FALSE);
+		Sbar_DrawXNum(stov(cvar_string("hud_item_armor_text_position")), x, 3, 0, cvar("hud_item_armor_text_scale"), Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);
 	}
 
 	// health
-	pos = edge - stov(cvar_string("hud_panel_status_item_health_text_position"));
-	pos2 = edge - stov(cvar_string("hud_panel_status_item_health_icon_position"));
 	x = health;
-	drawpic(pos2, "gfx/hud/sb_health", stov(cvar_string("hud_panel_status_item_health_icon_scale")), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-	pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '1 1 0' * cvar("hud_panel_status_item_health_text_scale")) * 0.5;
-	Sbar_DrawXNum(pos, x, 3, 0, cvar("hud_panel_status_item_health_text_scale"), Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);
+	Sbar_DrawPic("gfx/hud/sb_health", stov(cvar_string("hud_item_health_icon_position")), stov(cvar_string("hud_item_health_icon_scale")), FALSE);
+	Sbar_DrawXNum(stov(cvar_string("hud_item_health_text_position")), x, 3, 0, cvar("hud_item_health_text_scale"), Sbar_NumColor(x), sbar_alpha_fg, DRAWFLAG_NORMAL);
 
 	// if we are dead, we can skip the HUD from here
 	if(health <= 0)
@@ -2038,12 +2148,9 @@ void Sbar_Status()
 	// if we are using the jetpack, show fuel ammo. Otherwise show the ammo of our weapon
 	if(stat_items & IT_JETPACK && button_jetpack)
 	{
-		pos = edge - stov(cvar_string("hud_panel_status_item_noload_ammo_text_position"));
-		pos2 = edge - stov(cvar_string("hud_panel_status_item_ammo_icon_position"));
 		a = getstati(GetAmmoStat(0)); // how much fuel do we have?
-		drawpic(pos2, GetAmmoPicture(0), stov(cvar_string("hud_panel_status_item_noload_ammo_icon_scale")), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-		pos -= '1 0 0' * stringwidth(ftos(a), FALSE, '1 1 0' * cvar("hud_panel_status_item_noload_ammo_text_scale")) * 0.5;
-		Sbar_DrawXNum(pos, a, 3, 0, cvar("hud_panel_status_item_noload_ammo_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+		Sbar_DrawPic(GetAmmoPicture(0), stov(cvar_string("hud_item_ammo_icon_position")), stov(cvar_string("hud_item_ammo_noload_icon_scale")), FALSE);
+		Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_noload_text_position")), a, 3, 0, cvar("hud_item_ammo_noload_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 	}
 	else
 	{
@@ -2055,45 +2162,32 @@ void Sbar_Status()
 			// if (stat_items & GetAmmoItemCode(i))
 			{
 				a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?
-				pos2 = edge - stov(cvar_string("hud_panel_status_item_ammo_icon_position"));
-				drawpic(pos2, GetAmmoPicture(i), stov(cvar_string("hud_panel_status_item_ammo_icon_scale")), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+				Sbar_DrawPic(GetAmmoPicture(i), stov(cvar_string("hud_item_ammo_icon_position")), stov(cvar_string("hud_item_ammo_icon_scale")), FALSE);
 				weapon_clipsize = getstati(STAT_WEAPON_CLIPSIZE);
 
 				// if the weapon we're holding is reloadable, show both its ammo and load
 				if(weapon_clipsize)
 				{
 					weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);
-					pos = edge - stov(cvar_string("hud_panel_status_item_load_clip_text_position"));
 					if(weapon_clipload < 0) // we're reloading
-					{
-						pos -= '1 0 0' * stringwidth("- -", FALSE, '1 1 0' * cvar("hud_panel_status_item_load_clip_text_scale")) * 0.5;
-						drawstring(pos, "- -", '1 1 0' * cvar("hud_panel_status_item_load_clip_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-					}
+						Sbar_DrawString("- -", stov(cvar_string("hud_item_clip_load_text_position")), cvar("hud_item_clip_load_text_scale"));
 					else
-					{
-						pos -= '1 0 0' * stringwidth(ftos(weapon_clipload), FALSE, '1 1 0' * cvar("hud_panel_status_item_load_clip_text_scale")) * 0.5;
-						Sbar_DrawXNum(pos, weapon_clipload, 2, 0, cvar("hud_panel_status_item_load_clip_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-					}
-					pos = edge - stov(cvar_string("hud_panel_status_item_load_ammo_text_position"));
-					pos -= '1 0 0' * stringwidth(ftos(a), FALSE, '1 1 0' * cvar("hud_panel_status_item_load_ammo_text_scale")) * 0.5;
-					Sbar_DrawXNum(pos, a, 3, 0, cvar("hud_panel_status_item_load_ammo_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+						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_text_position")), a, 3, 0, cvar("hud_item_ammo_load_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 				}
 				else
 				{
-					pos = edge - stov(cvar_string("hud_panel_status_item_noload_ammo_text_position"));
-					pos -= '1 0 0' * stringwidth(ftos(a), FALSE, '1 1 0' * cvar("hud_panel_status_item_noload_ammo_text_scale")) * 0.5;
-					Sbar_DrawXNum(pos, a, 3, 0, cvar("hud_panel_status_item_noload_ammo_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+					Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_noload_text_position")), a, 3, 0, cvar("hud_item_ammo_noload_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 				}
 			}
 		}
 	}
 
 	// weapon icon
-	pos = edge - stov(cvar_string("hud_panel_status_item_weapon_position"));
 	entity e;
 	e = get_weaponinfo(activeweapon);
 	if (e && e.netname != "" && e.netname != "N/A")
-		drawpic(pos, strcat("gfx/hud/bg_status_activeweapon_", e.netname), stov(cvar_string("hud_panel_status_item_weapon_scale")), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+		Sbar_DrawPic(strcat("gfx/hud/bg_status_activeweapon_", e.netname), stov(cvar_string("hud_item_weapon_position")), stov(cvar_string("hud_item_weapon_scale")), FALSE);
 }
 
 void Sbar_Timer()
@@ -2861,30 +2955,6 @@ float vote_prev; // previous state of vote_active to check for a change
 float vote_alpha;
 float vote_change; // "time" when vote_active changed
 
-vector stomachstatus_colorfade_current;
-vector StomachStatus_ColorFade(vector target_color)
-{
-	local float step;
-	step = cvar("sbar_stomachboard_status_fade") * frametime;
-
-	if(stomachstatus_colorfade_current_x >= target_color_x + step)
-		stomachstatus_colorfade_current_x -= step;
-	else if(stomachstatus_colorfade_current_x <= target_color_x - step)
-		stomachstatus_colorfade_current_x += step;
-
-	if(stomachstatus_colorfade_current_y >= target_color_y + step)
-		stomachstatus_colorfade_current_y -= step;
-	else if(stomachstatus_colorfade_current_y <= target_color_y - step)
-		stomachstatus_colorfade_current_y += step;
-
-	if(stomachstatus_colorfade_current_z >= target_color_z + step)
-		stomachstatus_colorfade_current_z -= step;
-	else if(stomachstatus_colorfade_current_z <= target_color_z - step)
-		stomachstatus_colorfade_current_z += step;
-
-	return stomachstatus_colorfade_current;
-}
-
 void Sbar_Draw (void)
 {
 	// vectors for top right, bottom right, bottom and bottom left corners
@@ -3144,7 +3214,7 @@ void Sbar_Draw (void)
 
 		Sbar_Reset();
 
-		StomachStatus_ColorFade('0 0 0');
+		Sbar_ColorFade('0 0 0');
   	}
 	else
 	{
@@ -3195,23 +3265,7 @@ void Sbar_Draw (void)
 				}
 			}
 
-			vector hl_color;
-			string hl_string;
-			if(getstati(STAT_VORE_EATEN))
-			{
-				if(teamplay && (GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(spectatee_status - 1))) // same team
-					hl_color = stov(cvar_string("sbar_stomachboard_color2"));
-				else
-					hl_color = stov(cvar_string("sbar_stomachboard_color3"));
-				hl_string = "predator:";
-			}
-			else
-			{
-				hl_color = stov(cvar_string("sbar_stomachboard_color1"));
-				hl_string = "self:";
-			}
-			drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(hl_color), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);
-			drawstring(bottomleft - '-80 173 0', hl_string, '11 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Sbar_ColorFade(Sbar_GetVoreColor()), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);
 
 			float stomach_load, stomach_maxload; // shows the predator's stomach load when we are eaten, and ours otherwise
 			stomach_load = getstati(STAT_VORE_LOAD);
@@ -3247,8 +3301,10 @@ void Sbar_Draw (void)
 			entity pl, pred;
 			float f, l;
 
-			pos = bottomleft;
 			hud_total_prey = 0;
+			pos = stov(cvar_string("hud_item_preylist_position"));
+			vector sz = stov(cvar_string("hud_item_preylist_scale"));
+			vector dir = stov(cvar_string("hud_item_preylist_entry_spacing")) * 2;
 			for(pl = players.sort_next; pl; pl = pl.sort_next)
 			{
 				if(pl.team == COLOR_SPECTATOR)
@@ -3266,10 +3322,13 @@ void Sbar_Draw (void)
 
 				if(f)
 				{
-					if(l <= 8) // limit the stomach board to 9 entries due to the HUD design
+					if(l < cvar("hud_item_preylist_entry_number")) // limit the stomach board to the given number of entries
 					{
-						Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);
-						pos_y += 1.1 * sbar_fontsize_y;
+						Sbar_PrintStomachboardItem(pl, pos, sz);
+
+						// advance position for each entry
+						pos_x += sz_x * dir_x;
+						pos_y += sz_y * dir_y;
 						l += 1;
 					}
 					++hud_total_prey;
@@ -3286,7 +3345,7 @@ void Sbar_Draw (void)
 			}
 
 			// draw the predator's name
-			Sbar_PrintStomachboardItemPred(bottomleft - '-76 150 0', pred);
+			Sbar_PrintStomachboardItemPred(pred, stov(cvar_string("hud_item_predator_position")), stov(cvar_string("hud_item_predator_scale")));
 		}
 
 		// draw status, scores, timer, ring and portrait