From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 17 Jan 2011 10:16:53 +0000 (+0100)
Subject: Merge remote branch 'origin/terencehill/mapvote_fade'
X-Git-Tag: xonotic-v0.5.0~318^2~73^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7a8e4ad81bf523a53882ef97822b0641e424730c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/mapvote_fade'
---

7a8e4ad81bf523a53882ef97822b0641e424730c
diff --cc qcsrc/client/mapvoting.qc
index 4d96d5821,861d1d1d9..5baa268fc
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@@ -96,8 -107,9 +106,8 @@@ void MapVote_DrawAbstain(vector pos, fl
  	float text_size;
  	string label;
  	
- 	rgb = MapVote_RGB(id);
+ 	rgb = MapVote_RGB(id, count);
  
 -	drawfont = hud_font;
  	pos_y = pos_y + hud_fontsize_y;
  	
  	label = MapVote_FormatMapItem(id, "Don't care", count, tsize, hud_fontsize);