Merge remote branch 'origin/master' into mirceakitsune/preview_images
authorSamual <samual@xonotic.org>
Mon, 2 Jan 2012 05:52:58 +0000 (00:52 -0500)
committerSamual <samual@xonotic.org>
Mon, 2 Jan 2012 05:52:58 +0000 (00:52 -0500)
Conflicts:
qcsrc/client/mapvoting.qc

1  2 
qcsrc/client/Main.qc
qcsrc/client/mapvoting.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/menu/xonotic/maplist.c

Simple merge
@@@ -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)
Simple merge
Simple merge
Simple merge