From: Samual <samual@xonotic.org>
Date: Mon, 2 Jan 2012 05:52:58 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into mirceakitsune/preview_images
X-Git-Tag: xonotic-v0.6.0~188^2~16^2~3^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=684f569c626ee8a81b3269df66d5e36f123f450e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into mirceakitsune/preview_images

Conflicts:
	qcsrc/client/mapvoting.qc
---

684f569c626ee8a81b3269df66d5e36f123f450e
diff --cc qcsrc/client/mapvoting.qc
index 161ef8fbe,0af74018e..1eeb304c7
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@@ -88,10 -88,7 +88,10 @@@ void MapVote_DrawMapItem(vector pos, fl
  	}
  	else
  	{
 -		drawpic(pos, pic, img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
 +		if(precache_pic(pic) == "")
- 			drawpic(pos, draw_UseSkinFor("nopreview_map"), img_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
++			drawpic(pos, draw_UseSkinFor("nopreview_map"), img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
 +		else
- 			drawpic(pos, pic, img_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
++			drawpic(pos, pic, img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
  	}
  
  	if(id == mv_ownvote)