X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fclient%2Fsbar.qc;h=f0586cdacd7f5c653030cb81968818de8a93cbe6;hb=01a53c143145d0d348b6a9b4a71ee5494c428e8b;hp=c041ce66cfcb27663448985cf205035f3626e7c8;hpb=5a733fdede2c8a69c12cb5711fc4fd371d089ad8;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index c041ce66..f0586cda 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -72,7 +72,7 @@ vector Sbar_AccuracyColor(float accuracy)
 void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, float lettersize, vector rgb, float alpha, float dflags)
 {
 	float l;
-	string str, tmp, l_length;
+	string str, tmp, l_length, final_num;
 	float minus, plus;
 	vector vsize;
 
@@ -114,16 +114,12 @@ void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, fl
 	}
 
 	if(minus)
-	{
-		drawstring(pos, "-", vsize, rgb, alpha, dflags);
-		pos_x += lettersize / 2;
-	} else if(plus)
-	{
-		drawstring(pos, "+", vsize, rgb, alpha, dflags);
-		pos_x += lettersize / 2;
-	}
+		final_num = "-";
+	else if(plus)
+		final_num = "+";
 
-	drawstring(pos, str, vsize, rgb, alpha, dflags);
+	final_num = strcat(final_num, str);
+	drawstring(pos, final_num, vsize, rgb, alpha, dflags);
 }
 
 void Sbar_DrawXNum_Colored (vector pos, float x, float lettersize, float alpha)
@@ -923,6 +919,7 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl)
 
 	string str;
 	float f, field, field_number;
+	vector hl_color;
 	field_number = 3; // the number of components each row has
 
 	for(fieldcounter = 1; fieldcounter <= field_number; ++fieldcounter)
@@ -934,9 +931,15 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl)
 		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);
+			{
+				if(teamplay && GetPlayerColor(pl.entnum - 1) == GetPlayerColor(player_localentnum - 1)) // same team
+					hl_color = stov(cvar_string("sbar_stomachboard_color2"));
+				else
+					hl_color = stov(cvar_string("sbar_stomachboard_color3"));
+			}
 			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);
+				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);
 		}
 
 		if(field == ST_NAME) {
@@ -1653,7 +1656,7 @@ void Sbar_Score()
 {
 	float score, distribution, leader;
 	vector score_pos, secondary_score_pos, race_score_pos, distribution_color;
-	string racetime;
+	string racetime, secondary_racetime;
 	entity tm, pl, me;
 	me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];
 
@@ -1679,7 +1682,7 @@ void Sbar_Score()
 		score = me.(scores[ps_primary]);
 
 		float racemin, racesec, racemsec;
-		float distsec, distmsec, minusplus;
+		float distsec, distmsec;
 		string s_racemin, s_racesec, s_racemsec;
 		
 		racemin = floor(score/(60 * TIME_FACTOR));
@@ -1700,28 +1703,29 @@ void Sbar_Score()
 			if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR)
 				distmsec = fabs(distribution);
 			else {
-				distsec = floor(fabs(distribution)/TIME_FACTOR);
-				distmsec = fabs(distribution) - distsec*TIME_FACTOR;
-				if (distribution < 0)
-					distsec = -distsec;
+				distsec = floor(fabs(distribution) / TIME_FACTOR);
+				distmsec = fabs(distribution) - distsec * TIME_FACTOR;
 			}
 
-			if (distribution <= 0) {
+			if (distribution < 0) {
 				distribution_color = '0 1 0';
-				minusplus = 1; // minusplus 1: always prefix with minus sign
+				secondary_racetime = "-"; // always prefix with minus sign
 			}
-			else {
+			else if (distribution > 0) {
 				distribution_color = '1 0 0';
-				minusplus = 2; // minusplus 1: always prefix with plus sign
+				secondary_racetime = "+"; // minusplus 1: always prefix with plus sign
 			}
-			Sbar_DrawXNum(score_pos + '222 -6 0' - '14 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 14, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
-			Sbar_DrawXNum(score_pos + '222 6 0' - '14 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 14, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
+			else
+				distribution_color = '1 1 1';
+
+			secondary_racetime = strcat(secondary_racetime, ftos(distsec), ".", ftos(distmsec));
+			drawstring(score_pos + '222 0 0' - '14 0 0', secondary_racetime, '14 14 0', distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
 		}
 
 		racetime = strcat(s_racemin, " : ", s_racesec, " . ", s_racemsec);
 		race_score_pos = top + '0 0 0';
 		race_score_pos -= '1 0 0' * stringwidth(racetime, FALSE, '30 30 0') * 0.5;
-		drawstring(race_score_pos, racetime, '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
+		drawstring(race_score_pos, racetime, '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 
 	} else if (!teamplay) { // non-teamgames, except race/cts
 		// me vector := [team/connected frags id]
@@ -1747,7 +1751,7 @@ void Sbar_Score()
 		else
 			distribution_color = '1 0 0';
 		
-		Sbar_DrawXNum(secondary_score_pos, distribution, 6, 0, 16, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
+		Sbar_DrawXNum(secondary_score_pos, distribution, 6, 3, 16, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
 		Sbar_DrawXNum(score_pos, score, 6, 0, 34, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
 	} else { // teamgames
 		float max_fragcount;
@@ -1765,11 +1769,11 @@ void Sbar_Score()
 			if(tm.team == myteam) {
 				if (max_fragcount == score)
 					leader = 1;
-				Sbar_DrawXNum(score_pos, score, 6, 0, 34, GetTeamRGB(tm.team) * 0.4 + '0.6 0.6 0.6', sbar_alpha_fg, DRAWFLAG_NORMAL);
+				Sbar_DrawXNum(score_pos, score, 6, 0, 34, GetTeamRGB(tm.team), sbar_alpha_fg, DRAWFLAG_NORMAL);
 			} else {
 				if (max_fragcount == score)
 					leader = 1;
-				Sbar_DrawXNum(secondary_score_pos, score, 6, 0, 16, GetTeamRGB(tm.team) * 0.4 + '0.6 0.6 0.6', sbar_alpha_fg, DRAWFLAG_NORMAL);
+				Sbar_DrawXNum(secondary_score_pos, score, 6, 3, 16, GetTeamRGB(tm.team), sbar_alpha_fg, DRAWFLAG_NORMAL);
 				secondary_score_pos = secondary_score_pos + '0 16 0';
 			}
 		}
@@ -1940,14 +1944,12 @@ void Sbar_Timer()
 	} else {
 		minutes = minutesLeft;
 		seconds = secondsLeft;
-		if (minutes == 0)
-			bgpos_x = topright_x - (58 + 7 + 12) * scale;
-		else if (minutes < 10) // nudge the timer background left if more digits are drawn
-			bgpos_x = topright_x - (66 + 17 + 12) * scale;
+		if (minutes < 10) // nudge the timer background left if more digits are drawn
+			bgpos_x = topright_x - (54 + 17 + 12) * scale;
 		else if (minutes < 100)
-			bgpos_x = topright_x - (74 + 17 + 12) * scale;
+			bgpos_x = topright_x - (62 + 17 + 12) * scale;
 		else
-			bgpos_x = topright_x - (82 + 17 + 12) * scale;
+			bgpos_x = topright_x - (70 + 17 + 12) * scale;
 		bgpos_y = 0;
 		bgpos_z = 0;
 	}
@@ -1965,9 +1967,7 @@ void Sbar_Timer()
 	}
 
 	drawpic(topright - ('19 0 0' + '3 0 0' - '0 2 0'), "gfx/hud/sb_time", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-	if(minutesLeft >= 1 || cvar("sbar_increment_maptime") || timelimit == 0 || warmup_stage) {
-		finaltime = strcat(ftos(minutes), ":");
-	}
+	finaltime = strcat(ftos(minutes), ":");
 	if(seconds < 10)
 		finaltime = strcat(finaltime, "0", ftos(seconds));
 	else
@@ -1978,6 +1978,73 @@ void Sbar_Timer()
 	drawstring(pos, finaltime, 18 * scale * '1 1 0', timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
 }
 
+void Sbar_Ring()
+{
+	vector ring_pos, ring1_color, ring2_color;
+	vector text_pos, text1_size, text2_size;
+	float ring_alpha, ring1_size, ring1_clip, ring2_size, ring2_clip;
+	string text1_msg, text2_msg;
+
+	ring_pos_x = vid_conwidth / 2;
+	ring_pos_y = vid_conheight / 1.375;
+	ring1_size = 100;
+	ring2_size = 60;
+	ring_alpha = sbar_alpha_fg * 1;
+	text1_size = '12 12 0';
+	text2_size = '10 10 0';
+
+	switch(getstati(STAT_SBRING1_TYPE))
+	{
+		case 0:
+			// ring disabled
+			break;
+		case 1:
+			// ring shows vore system delay, empties with progress
+			ring1_color = '0.5 0.5 1';
+			text1_msg = "Vore delay";
+			break;
+		case 2:
+			// ring shows stomach kick delay, empties with progress
+			ring1_color = '1 1 0.5';
+			text1_msg = "Kick delay";
+			break;
+		default:
+			print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));
+			break;
+	}
+	switch(getstati(STAT_SBRING2_TYPE))
+	{
+		case 0:
+			// ring disabled
+			break;
+		case 1:
+			// ring shows regurgitation preparing, fills with progress
+			ring2_color = '1 0.5 1';
+			text2_msg = "Regurgitating...";
+			break;
+		default:
+			print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));
+			break;
+	}
+	ring1_clip = getstatf(STAT_SBRING1_CLIP);
+	ring2_clip = getstatf(STAT_SBRING2_CLIP);
+
+	if(text1_msg != "")
+	{
+		DrawCircleClippedPic(ring_pos, ring1_size, "gfx/hud/sb_ring.tga", ring1_clip, ring1_color, ring_alpha, DRAWFLAG_ADDITIVE);
+		text_pos_x = ring_pos_x - stringwidth(text1_msg, FALSE, text1_size) / 2;
+		text_pos_y = ring_pos_y - ring1_size / 2;
+		drawstring(text_pos, text1_msg, text1_size, ring1_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
+	}
+	if(text2_msg != "")
+	{
+		DrawCircleClippedPic(ring_pos, ring2_size, "gfx/hud/sb_ring.tga", ring2_clip, ring2_color, ring_alpha, DRAWFLAG_ADDITIVE);
+		text_pos_x = ring_pos_x - stringwidth(text2_msg, FALSE, text2_size) / 2;
+		text_pos_y = ring_pos_y + ring1_size / 2;
+		drawstring(text_pos, text2_msg, text2_size, ring2_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
+	}
+}
+
 void CSQC_Strength_Timer() {
 	vector pos;
 	vector bottomright;
@@ -2926,16 +2993,23 @@ void Sbar_Draw (void)
 				}
 			}
 
+			vector hl_color;
+			string hl_string;
 			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 173 0', "predator:", '11 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+				if(teamplay && GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1)) // same team
+					hl_color = stov(cvar_string("sbar_stomachboard_color2"));
+				else
+					hl_color = stov(cvar_string("sbar_stomachboard_color3"));
+				hl_string = "predator:";
 			}
 			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 173 0', "self:", '11 11 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+				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);
 
 			float stomach_load;
 			stomach_load = getstati(STAT_VORE_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise
@@ -3078,9 +3152,10 @@ void Sbar_Draw (void)
 		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
+		// draw scores, timer, and ring
 		Sbar_Score();
 		Sbar_Timer();
+		Sbar_Ring();
 
 		// draw strength/invincibility icon and timer
 		CSQC_Strength_Timer();