From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 15 Apr 2011 11:06:04 +0000 (+0300)
Subject: Some tweaks to show-minus-plus
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a58b5808428f9ae2776a7d8c4f1b42dbee887420;p=voretournament%2Fvoretournament.git

Some tweaks to show-minus-plus
---

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index c041ce66..b7a7d20a 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)
@@ -1747,7 +1743,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;
@@ -1769,7 +1765,7 @@ void Sbar_Score()
 			} 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) * 0.4 + '0.6 0.6 0.6', sbar_alpha_fg, DRAWFLAG_NORMAL);
 				secondary_score_pos = secondary_score_pos + '0 16 0';
 			}
 		}