X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fclient%2Fsbar.qc;h=304f4e5b6858aff736de8698c4ec3baf1d944373;hp=feba5f95488b7357ef97d8752e6558ea2127d255;hb=f91e80bd8fc5ff722a1cfee7a8050a16fac7ab46;hpb=af44a1c5ee1262c289095b9d8fc92a56132a0164

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index feba5f95..304f4e5b 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -29,7 +29,6 @@ float ps_primary, ps_secondary;
 float ts_primary, ts_secondary;
 
 vector color;
-float SCOREBOARD_OFFSET = 50;
 
 void CSQC_kh_hudreset();
 void CSQC_kh_hud();
@@ -156,8 +155,8 @@ void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, fl
 	{
 		tmp = substring(str, i, 1);
 		if (stroke == 1)
-			drawpic(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
-		drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags);
+			drawstring(pos, tmp, vsize, rgb, alpha, dflags);
+		drawstring(pos, tmp, vsize, num_color, alpha, dflags);
 		pos_x += lettersize;
 	}
 }
@@ -509,14 +508,15 @@ void Cmd_Sbar_SetFields(float argc)
 			sbar_field[sbar_num_fields] = SP_SEPARATOR;
 			have_separator = 1;
 		} else {
+			if(gametype == GAME_RPG)
+				return;
+
 			for(j = 0; j < MAX_SCORE; ++j)
 				if(str == strtolower(scores_label[j]))
 					goto found; // sorry, but otherwise fteqcc -O3 miscompiles this and warns about "unreachable code"
 :notfound
-			if(str == "frags" && !(gametype == GAME_RPG))
-			{
+			if(str == "frags")
 				j = SP_FRAGS;
-			}
 			else
 			{
 				if not(nocomplain)
@@ -716,18 +716,11 @@ string Sbar_GetField(entity pl, float field)
 
 string Sbar_GetStomachField(entity pl, float field)
 {
-	sbar_field_rgb = '1 1 1';
-	sbar_field_icon0 = "";
-	sbar_field_icon1 = "";
-	sbar_field_icon2 = "";
-	sbar_field_icon0_rgb = '1 1 1';
-	sbar_field_icon1_rgb = '1 1 1';
-	sbar_field_icon2_rgb = '1 1 1';
-	sbar_field_icon0_alpha = 1;
-	sbar_field_icon1_alpha = 1;
-	sbar_field_icon2_alpha = 1;
 	switch(field)
 	{
+		case ST_HIGHLIGHT:
+			return ""; // the returned value is not used, we only need the field
+
 		case ST_NAME:
 			return GetPlayerName(pl.sv_entnum);
 
@@ -740,6 +733,18 @@ string Sbar_GetStomachField(entity pl, float field)
 	//return "error";
 }
 
+string Sbar_GetStomachFieldPred(entity pl, float field)
+{
+	switch(field)
+	{
+		case STP_NAME:
+			return GetPlayerName(pl.sv_entnum);
+		default:
+			return "N/A";
+	}
+	//return "error";
+}
+
 float xmin, xmax, ymin, ymax, sbwidth;
 float sbar_fixscoreboardcolumnwidth_len;
 float sbar_fixscoreboardcolumnwidth_iconlen;
@@ -949,25 +954,24 @@ void Sbar_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_num
 float fieldcounter;
 void Sbar_PrintStomachboardItem(vector pos, entity pl)
 {
-	// list the players in the stomach
+	// lists all players in the stomach
 
 	string str;
-	float f, field;
+	float f, field, field_number;
+	field_number = 3; // the number of components each row has
 
-	for(fieldcounter = 1; fieldcounter <= 2; ++fieldcounter)
+	for(fieldcounter = 1; fieldcounter <= field_number; ++fieldcounter)
 	{
 		field = -fieldcounter;
-		if(field == SP_SEPARATOR)
-			break;
-
 		str = Sbar_GetStomachField(pl, field);
 
-		if(field == ST_NAME) // do this for one field, or we get multiple highlights in the same spot
+		// row highlighting
+		if(field == ST_HIGHLIGHT)
 		{
-			if(getstati(STAT_STOMACH_EATEN))
-				drawfill(pos - '0 0 0', '193 11 0', '1 0 0' * cvar("sbar_stomachboard_highlight_brightness"), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL);
+			if(getstati(STAT_VORE_EATEN))
+				drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color2")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);
 			else
-				drawfill(pos - '0 0 0', '193 11 0', '0 1 0' * cvar("sbar_stomachboard_highlight_brightness"), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL);
+				drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color1")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);
 		}
 
 		if(field == ST_NAME) {
@@ -977,11 +981,11 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl)
 			drawpic(pos, "gfx/sb_playercolor_pants", '22 11 0', colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);
 
 			pos_x += 24;
-			drawcolorcodedstring(pos, str, '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			drawcolorcodedstring(pos, textShortenToWidth(str, 138, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
 		}
 
 		if(field == ST_HEALTH)
-		if(g_vore_showpreyhealth) {
+		if(stof(str) > 0) {
 			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);
@@ -997,29 +1001,27 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl)
 }
 
 float fieldcounter2;
-void Sbar_PrintStomachboardItem2(vector pos, entity pl)
+void Sbar_PrintStomachboardItemPred(vector pos, entity pl)
 {
-	// show the name of our eater
+	// shows the name of our predator
 
 	string str;
-	float f, field;
+	float f, field, field_number;
+	field_number = 1; // the number of components each row has
 
-	for(fieldcounter2 = 1; fieldcounter2 <= 2; ++fieldcounter2)
+	for(fieldcounter2 = 1; fieldcounter2 <= field_number; ++fieldcounter2)
 	{
 		field = -fieldcounter2;
-		if(field == SP_SEPARATOR)
-			break;
+		str = Sbar_GetStomachFieldPred(pl, field);
 
-		str = Sbar_GetStomachField(pl, field);
-
-		if(field == ST_NAME) {
+		if(field == STP_NAME) {
 			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);
 
 			pos_x += 24;
-			drawcolorcodedstring(pos, str, '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			drawcolorcodedstring(pos, textShortenToWidth(str, 122, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
 		}
 	}
 }
@@ -1382,7 +1384,7 @@ void Sbar_DrawScoreboard()
 	sbwidth = Sbar_GetWidth(6.5 * sbar_fontsize_y);
 
 	xmin = 0.5 * (vid_conwidth - sbwidth);
-	ymin = SCOREBOARD_OFFSET;
+	ymin = cvar("sbar_scoreboard_offset");
 
 	xmax = vid_conwidth - xmin;
 	ymax = vid_conheight - 0.2*vid_conheight;
@@ -1394,7 +1396,10 @@ void Sbar_DrawScoreboard()
 
 	// Heading
 	drawfont = sbar_bigfont;
-	drawstringcenter('0 1 0' * ymin, "Scoreboard", '24 24 0', '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+	if(gametype == GAME_RPG)
+		drawstringcenter('0 1 0' * ymin, "Players", '24 24 0', '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+	else
+		drawstringcenter('0 1 0' * ymin, "Scoreboard", '24 24 0', '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
 
 	pos_y += 24 + 4;
 	pos_y += sbar_fontsize_y;
@@ -1475,7 +1480,10 @@ void Sbar_DrawScoreboard()
 	// Print info string
 	string str;
 	float tl, fl, ll;
-	str = strcat("playing on ^2", shortmapname, "^7");
+	if(gametype == GAME_RPG)
+		str = strcat("you are in ^2", shortmapname, "^7");
+	else
+		str = strcat("playing on ^2", shortmapname, "^7");
 	tl = getstatf(STAT_TIMELIMIT);
 	fl = getstatf(STAT_FRAGLIMIT);
 	ll = getstatf(STAT_LEADLIMIT);
@@ -1488,7 +1496,7 @@ void Sbar_DrawScoreboard()
 	{
 		if(tl > 0)
 			str = strcat(str, " for ^1", ftos(tl), " minutes^7");
-		if(fl > 0)
+		if(fl > 0 && !(gametype == GAME_RPG))
 		{
 			if(tl > 0)
 				str = strcat(str, " or");
@@ -2395,17 +2403,17 @@ void Sbar_DrawAccuracyStats_Description_Hitscan(vector position)
 	drawstring(position + '0 9 0' * sbar_fontsize_y, "Shots missed:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 }
 
-void Sbar_DrawAccuracyStats_Description_Splash(vector position)
+/*void Sbar_DrawAccuracyStats_Description_Splash(vector position)
 {
 	drawstring(position + '0 3 0' * sbar_fontsize_y, "Maximum damage:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 	drawstring(position + '0 5 0' * sbar_fontsize_y, "Actual damage:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 	drawstring(position + '0 7 0' * sbar_fontsize_y, "Accuracy:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 	drawstring(position + '0 9 0' * sbar_fontsize_y, "Damage wasted:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
+}*/ // we have no splash damage weapons, but keep this code just in case
 
 void Sbar_DrawAccuracyStats()
 {
-	float i, count_hitscan, count_splash, row_hitscan, row_splash;  // count is the number of 'colums'
+	float i, count_hitscan, /*count_splash,*/ row_hitscan/*, row_splash*/;  // count is the number of 'colums'
 	float weapon_hit, weapon_damage, weapon_stats;
 	float left_border;  // position where the weapons start, the description is in the border
 	vector fill_colour, fill_size;
@@ -2420,7 +2428,7 @@ void Sbar_DrawAccuracyStats()
 
 	drawfont = sbar_bigfont;
 	pos_x = 0;
-	pos_y = SCOREBOARD_OFFSET;
+	pos_y = cvar("sbar_scoreboard_offset");
 	pos_z = 0;
 	drawstringcenter(pos, "Weapon Accuracy", 2 * sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 
@@ -2446,11 +2454,11 @@ void Sbar_DrawAccuracyStats()
 		return;
 	}
 
-	float top_border_hitscan = SCOREBOARD_OFFSET + 55;  // position where the hitscan row starts: pixels down the screen
+	float top_border_hitscan = cvar("sbar_scoreboard_offset") + 55;  // position where the hitscan row starts: pixels down the screen
 	Sbar_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * top_border_hitscan);
 
-	float top_border_splash = SCOREBOARD_OFFSET + 175;  // position where the splash row starts: pixels down the screen
-	Sbar_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * top_border_splash);
+//	float top_border_splash = cvar("sbar_scoreboard_offset") + 175;  // position where the splash row starts: pixels down the screen
+//	Sbar_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * top_border_splash);
 
 	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 	{
@@ -2462,7 +2470,7 @@ void Sbar_DrawAccuracyStats()
 		border_colour = (i == activeweapon) ? '1 1 1' : '0 0 0';  // white or black border
 
 		if (weapon_damage) {
-			if (self.spawnflags & WEP_TYPE_SPLASH) {
+			/*if (self.spawnflags & WEP_TYPE_SPLASH) {
 				weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
 
 				fill_colour_x = 1 - 0.015 * weapon_stats;
@@ -2512,7 +2520,9 @@ void Sbar_DrawAccuracyStats()
 				drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 9 0' * sbar_fontsize_y, ftos(max(0, weapon_damage - weapon_hit)), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 
 				++count_splash;
-			} else if (self.spawnflags & WEP_TYPE_HITSCAN) {
+			} else*/ // we have no splash damage weapons, but keep this code just in case
+
+			if (self.spawnflags & WEP_TYPE_HITSCAN) {
 				weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
 
 				fill_colour_x = 1 - 0.015 * weapon_stats;
@@ -2583,7 +2593,7 @@ float GetAmmoStat(float i)
 {
 	switch(i)
 	{
-		case 1: return STAT_FUEL;
+		case 0: return STAT_FUEL;
 		default: return -1;
 	}
 }
@@ -2592,7 +2602,7 @@ float GetAmmoItemCode(float i)
 {
 	switch(i)
 	{
-		case 1: return IT_FUEL;
+		case 0: return IT_FUEL;
 		default: return -1;
 	}
 }
@@ -2601,7 +2611,7 @@ string GetAmmoPicture(float i)
 {
 	switch(i)
 	{
-		case 1: return "gfx/hud/sb_fuel";
+		case 0: return "gfx/hud/sb_fuel";
 		default: return "";
 	}
 }
@@ -2625,28 +2635,28 @@ 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 colortrans_current;
-vector Stomachstatus_Colortrans(vector target_color)
+vector stomachstatus_colorfade_current;
+vector StomachStatus_ColorFade(vector target_color)
 {
 	local float step;
-	step = cvar("sbar_stomachboard_status_fade");
+	step = cvar("sbar_stomachboard_status_fade") * frametime;
 
-	if(colortrans_current_x > target_color_x + step)
-		colortrans_current_x -= step;
-	else if(colortrans_current_x < target_color_x - step)
-		colortrans_current_x += step;
+	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(colortrans_current_y > target_color_y + step)
-		colortrans_current_y -= step;
-	else if(colortrans_current_y < target_color_y - step)
-		colortrans_current_y += 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(colortrans_current_z > target_color_z + step)
-		colortrans_current_z -= step;
-	else if(colortrans_current_z < target_color_z - step)
-		colortrans_current_z += 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 colortrans_current;
+	return stomachstatus_colorfade_current;
 }
 
 void Sbar_Draw (void)
@@ -2893,15 +2903,9 @@ void Sbar_Draw (void)
 	Sbar_UpdatePlayerTeams();
 	if (intermission == 2) // map voting screen
 	{
-		if(spectatee_status != -1) {
-			Sbar_Score();
-			Sbar_Timer();
-		}
-		else if(sb_showscores) {
-              		Sbar_DrawScoreboard();
-                        Sbar_Score();
-                        Sbar_Timer();
-                }
+		Sbar_Timer();
+		if(sb_showscores)
+			Sbar_DrawScoreboard();
 		else
 			Sbar_FinaleOverlay();
 
@@ -2915,7 +2919,7 @@ void Sbar_Draw (void)
 
 		Sbar_Reset();
 
-		Stomachstatus_Colortrans('0 0 0');
+		StomachStatus_ColorFade('0 0 0');
   	}
 	else
 	{
@@ -2924,7 +2928,7 @@ void Sbar_Draw (void)
 		else
 			Sbar_DrawScoreboard();
 		float armor, health;
-		armor = getstati(STAT_ARMOR); // armor is not used in Vore Tournament by default, but still exists for mods that might want it
+		armor = getstati(STAT_ARMOR);
 		health = getstati(STAT_HEALTH);
 
 		stat_items = getstati(STAT_ITEMS);
@@ -2933,78 +2937,82 @@ void Sbar_Draw (void)
 		fade = 3.2 - 2 * (time - weapontime);
 		fade = bound(0.7, fade, 1);
 
-		if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) {
-			if (teamplay)
-				drawpic(bottomleft- '0 256 0', "gfx/hud/bg_stomach", '256 256 0', 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_x = cvar("sbar_color_bg_r");
-				color_y = cvar("sbar_color_bg_g");
-				color_z = cvar("sbar_color_bg_b");
-
-				drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);
+		if(g_vore) // only when the vore system is active
+		{
+			// draw the stomach board
+			if (cvar("viewsize") <= 100) {
+				if (teamplay)
+					drawpic(bottomleft- '0 256 0', "gfx/hud/bg_stomach", '256 256 0', 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_x = cvar("sbar_color_bg_r");
+					color_y = cvar("sbar_color_bg_g");
+					color_z = cvar("sbar_color_bg_b");
+
+					drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);
+				}
 			}
 
-			if(getstati(STAT_STOMACH_EATEN))
+			if(getstati(STAT_VORE_EATEN))
 			{
-				drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Stomachstatus_Colortrans('1 0 0' * cvar("sbar_stomachboard_status_brightness")), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL);
+				drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color2"))), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);
 				drawstring(bottomleft - '-80 172 0', "predator:", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 			}
 			else
 			{
-				drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Stomachstatus_Colortrans('0 1 0' * cvar("sbar_stomachboard_status_brightness")), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL);
+				drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color1"))), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);
 				drawstring(bottomleft - '-80 172 0', "self:", '10 10 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 			}
-		}
-		float stomach_load;
-		stomach_load = getstati(STAT_STOMACH_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise
-
-		Sbar_DrawXNum(bottomleft - '-18 170 0', bound(0, stomach_load, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-		drawstring(bottomleft - '-40 170 0', "/", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-		Sbar_DrawXNum(bottomleft - '-50 170 0', bound(0, g_balance_vore_swallow_limit, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-		if(getstati(STAT_STOMACH_DIGESTING))
-			drawstring(bottomleft - '-76 142 0', "stomach digesting", '12 12 0', '1 0.5 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);
-		else if(stomach_load == g_balance_vore_swallow_limit)
-			drawstring(bottomleft - '-76 142 0', "stomach full", '12 12 0', '0.5 1 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);
-		else if(!stomach_load)
-			drawstring(bottomleft - '-76 142 0', "stomach empty", '12 12 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-		else
-			drawstring(bottomleft - '-76 142 0', "stomach has prey", '12 12 0', '0.75 1 0.75', sbar_alpha_fg, DRAWFLAG_NORMAL);
 
-		// draw the stomach board
-		entity pl;
-		float f;
+			float stomach_load;
+			stomach_load = getstati(STAT_VORE_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise
 
-		pos = bottomleft;
-		for(pl = players.sort_next; pl; pl = pl.sort_next)
-		{
-			if(pl.team == COLOR_SPECTATOR)
-				continue;
+			Sbar_DrawXNum(bottomleft - '-18 170 0', bound(0, stomach_load, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
+			drawstring(bottomleft - '-40 170 0', "/", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			Sbar_DrawXNum(bottomleft - '-50 170 0', bound(0, g_balance_vore_swallow_limit, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
 
-			if(getstati(STAT_STOMACH_EATEN))
-			{
-				f = pl.pleater == getstati(STAT_STOMACH_EATEN);
-			}
+			if(getstati(STAT_VORE_DIGESTING))
+				drawstring(bottomleft - '-76 142 0', "stomach digesting", '12 12 0', '1 0.5 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			else if(stomach_load == g_balance_vore_swallow_limit)
+				drawstring(bottomleft - '-76 142 0', "stomach full", '12 12 0', '0.5 1 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			else if(!stomach_load)
+				drawstring(bottomleft - '-76 142 0', "stomach empty", '12 12 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 			else
+				drawstring(bottomleft - '-76 142 0', "stomach has prey", '12 12 0', '0.75 1 0.75', sbar_alpha_fg, DRAWFLAG_NORMAL);
+
+			// draw the stomach board player list
+			entity pl;
+			float f;
+
+			pos = bottomleft;
+			for(pl = players.sort_next; pl; pl = pl.sort_next)
 			{
-				if(spectatee_status)
-					f = pl.pleater == spectatee_status;
+				if(pl.team == COLOR_SPECTATOR)
+					continue;
+
+				if(getstati(STAT_VORE_EATEN))
+					f = pl.plpredator == getstati(STAT_VORE_EATEN);
 				else
-					f = pl.pleater == player_localentnum;
-			}
+				{
+					if(spectatee_status)
+						f = pl.plpredator == spectatee_status;
+					else
+						f = pl.plpredator == player_localentnum;
+				}
 
-			if(f)
-			{
-				Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);
-				pos_y += 1.25 * sbar_fontsize_y;
-			}
+				if(f)
+				{
+					Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);
+					pos_y += 1.25 * sbar_fontsize_y;
+				}
 
-			if(getstati(STAT_STOMACH_EATEN))
-			if(pl.sv_entnum == getstati(STAT_STOMACH_EATEN) - 1)
-				Sbar_PrintStomachboardItem2(bottomleft - '-76 156 0', pl);
+				if(getstati(STAT_VORE_EATEN))
+				if(pl.sv_entnum == getstati(STAT_VORE_EATEN) - 1)
+					Sbar_PrintStomachboardItemPred(bottomleft - '-76 156 0', pl);
+			}
 		}
 
-		if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) {
+		if (cvar("viewsize") <= 100) {
 			if (teamplay)
 				drawpic(bottom - '96 96 0', "gfx/hud/bg_status", '192 96 0', GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color
 			else {
@@ -3017,8 +3025,19 @@ void Sbar_Draw (void)
 			}
 		}
 
-		vector health_pos;
+		vector health_pos, armor_pos;
 		health_pos = bottom - '77 58 0';
+		armor_pos = bottom - '62 68 0';
+
+		// armor
+		x = armor;
+		if (x > 0)
+		{
+			drawpic(armor_pos + '10.5 -13.5 0', "gfx/hud/sb_armor", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+			if(x < 100) armor_pos_x -= 4.5; // always center
+			if(x < 10) armor_pos_x -= 7; // always center
+			Sbar_DrawXNum_Colored(armor_pos, x, 12, sbar_alpha_fg);
+		}
 
 		// health
 		x = health;
@@ -3027,18 +3046,51 @@ void Sbar_Draw (void)
 		if(x < 10) health_pos_x -= 11; // always center
 		Sbar_DrawXNum_Colored(health_pos, x, 22, sbar_alpha_fg);
 
-		// fuel ammo
-		a = getstati(GetAmmoStat(1)); // how much fuel do we have?
+		// ammo
+		pos_x = bottom_x + 140;
+		pos_y = bottom_y - 20;
+
+		float weapon_clipload, weapon_clipsize;
 
-		if (a > 0) { // if we have fuel, draw the amount
-			float invincibility_time, dt;
-			invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
-			dt = invincibility_time - time;
-			pos_x = bottom_x + 140;
-			pos_y = bottom_y - 20;
-			drawpic(pos - '98 18 0', GetAmmoPicture(1), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+		// if we are using the jetpack, show fuel ammo. Otherwise show the ammo of our weapon
+		if(stat_items & IT_JETPACK && button_jetpack)
+		{
+			a = getstati(GetAmmoStat(0)); // how much fuel do we have?
+			drawpic(pos - '98 18 0', GetAmmoPicture(0), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 			Sbar_DrawXNum(pos - '144 16 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
 		}
+		else
+		{
+			float i;
+			for (i = 0; i < 1; ++i)
+			{
+				if (stat_items & GetAmmoItemCode(i))
+				{
+					a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?
+					drawpic(pos - '98 18 0', GetAmmoPicture(i), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+					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);
+						if(weapon_clipload < 0) // we're reloading
+							drawstring(pos - '124 23 0', "- -", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+						else
+							Sbar_DrawXNum(pos - '132 23 0', weapon_clipload, 2, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
+						Sbar_DrawXNum(pos - '137 7 0', a, 3, 0, 12, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
+					}
+					else
+						Sbar_DrawXNum(pos - '144 16 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
+				}
+			}
+		}
+
+		// weapon icon
+		entity e;
+		e = get_weaponinfo(activeweapon);
+		if (e && e.netname != "" && e.netname != "N/A")
+			drawpic(bottom - '96 96 0', strcat("gfx/hud/bg_status_activeweapon_", e.netname), '192 96 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 
 		// draw scores and timer
 		Sbar_Score();
@@ -3054,6 +3106,16 @@ void Sbar_Draw (void)
 			CSQC_ctf_hud();
 		else if(gametype == GAME_CTS || gametype == GAME_RACE)
 			CSQC_race_hud();
+
+		// draw the canleave message
+		if(getstati(STAT_VORE_CANLEAVE))
+		if not(spectatee_status) // this message doesn't address spectated players
+		{
+			s = strcat("^7Press ^3", getcommandkey("jump", "+jump"), " ^7to exit");
+			pos_x = bottom_x - stringwidth(s, TRUE, '0 0 0') * 16 / 2;
+			pos_y = bottom_y - 120;
+			drawcolorcodedstring(pos, s, '16 16 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+		}
 	}
 	return;
 }