X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fclient%2Fsbar.qc;h=0c95d1609bcdb516a689be910cafcbdd79d93282;hp=c03ac7138a0667d36e3509368bfd07a8e035c693;hb=b0ed14220ec0a63a70a41bdc65420065ef65d006;hpb=16e52b805a48d1b0a23823c01e50bc8fbf341469

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index c03ac713..0c95d160 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();
@@ -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,17 +954,26 @@ void Sbar_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_num
 float fieldcounter;
 void Sbar_PrintStomachboardItem(vector pos, entity pl)
 {
+	// 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);
 
+		// row highlighting
+		if(field == ST_HIGHLIGHT)
+		{
+			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', stov(cvar_string("sbar_stomachboard_color1")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);
+		}
+
 		if(field == ST_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);
@@ -967,14 +981,14 @@ 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) {
 			pos_x += 138;
 				if(pl.sv_entnum == player_localentnum - 1 || (spectatee_status && pl.sv_entnum == spectatee_status - 1))
-					drawcolorcodedstring(pos, " me", '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
+					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);
@@ -986,27 +1000,28 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl)
 	}
 }
 
+float fieldcounter2;
 void Sbar_PrintStomachboardItemPred(vector pos, entity pl)
 {
+	// 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(fieldcounter = 1; fieldcounter <= 2; ++fieldcounter)
+	for(fieldcounter2 = 1; fieldcounter2 <= field_number; ++fieldcounter2)
 	{
-		field = -fieldcounter;
-		if(field == SP_SEPARATOR)
-			break;
-
-		str = Sbar_GetStomachField(pl, field);
+		field = -fieldcounter2;
+		str = Sbar_GetStomachFieldPred(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);
 		}
 	}
 }
@@ -1369,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;
@@ -2382,17 +2397,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;
@@ -2407,7 +2422,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);
 
@@ -2433,11 +2448,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)
 	{
@@ -2449,7 +2464,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;
@@ -2499,7 +2514,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;
@@ -2570,7 +2587,7 @@ float GetAmmoStat(float i)
 {
 	switch(i)
 	{
-		case 1: return STAT_FUEL;
+		case 0: return STAT_FUEL;
 		default: return -1;
 	}
 }
@@ -2579,7 +2596,7 @@ float GetAmmoItemCode(float i)
 {
 	switch(i)
 	{
-		case 1: return IT_FUEL;
+		case 0: return IT_FUEL;
 		default: return -1;
 	}
 }
@@ -2588,7 +2605,7 @@ string GetAmmoPicture(float i)
 {
 	switch(i)
 	{
-		case 1: return "gfx/hud/sb_fuel";
+		case 0: return "gfx/hud/sb_fuel";
 		default: return "";
 	}
 }
@@ -2612,6 +2629,30 @@ 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
@@ -2877,6 +2918,8 @@ void Sbar_Draw (void)
 		Sbar_Timer();
 
 		Sbar_Reset();
+
+		StomachStatus_ColorFade('0 0 0');
   	}
 	else
 	{
@@ -2894,7 +2937,8 @@ void Sbar_Draw (void)
 		fade = 3.2 - 2 * (time - weapontime);
 		fade = bound(0.7, fade, 1);
 
-		if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) {
+		// 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 {
@@ -2906,13 +2950,26 @@ void Sbar_Draw (void)
 				drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);
 			}
 		}
+
+		if(getstati(STAT_VORE_EATEN))
+		{
+			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_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
+		stomach_load = getstati(STAT_VORE_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))
+
+		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);
@@ -2921,7 +2978,7 @@ void Sbar_Draw (void)
 		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
+		// draw the stomach board player list
 		entity pl;
 		float f;
 
@@ -2931,16 +2988,14 @@ void Sbar_Draw (void)
 			if(pl.team == COLOR_SPECTATOR)
 				continue;
 
-			if(getstati(STAT_STOMACH_EATEN))
-			{
-				f = pl.pleater == getstati(STAT_STOMACH_EATEN);
-			}
+			if(getstati(STAT_VORE_EATEN))
+				f = pl.plpredator == getstati(STAT_VORE_EATEN);
 			else
 			{
 				if(spectatee_status)
-					f = pl.pleater == spectatee_status;
+					f = pl.plpredator == spectatee_status;
 				else
-					f = pl.pleater == player_localentnum;
+					f = pl.plpredator == player_localentnum;
 			}
 
 			if(f)
@@ -2949,12 +3004,12 @@ void Sbar_Draw (void)
 				pos_y += 1.25 * sbar_fontsize_y;
 			}
 
-			if(getstati(STAT_STOMACH_EATEN))
-			if(pl.sv_entnum == getstati(STAT_STOMACH_EATEN) - 1)
-				Sbar_PrintStomachboardItemPred(pos - '-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 {
@@ -2977,18 +3032,36 @@ 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;
 
-		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);
+					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();
@@ -3004,6 +3077,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;
 }