X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=48b2106e1471b9d99a1227d69c40656fc7f021c7;hb=d7a010137bb18ba896e4196140ffe8f4afb4de6c;hp=e94d6a68aa786786f9babdf009e71deeb5b64259;hpb=49a1b0a79699721877d9630fc598574bb0ac91b2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index e94d6a68aa..48b2106e14 100644
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -26,7 +26,7 @@ string MapVote_FormatMapItem(float id, string map, float count, float maxwidth,
 	{
 		if(count == 1)
 			post = _(" (1 vote)");
-		else
+		else if(count >= 0)
 			post = sprintf(_(" (%d votes)"), count);
 	}
 	else
@@ -170,7 +170,7 @@ void MapVote_Draw()
 
 	if(!mv_active)
 		return;
-	
+
 	mv_mousepos = mv_mousepos + getmousepos();
 
 	mv_mousepos_x = bound(0, mv_mousepos_x, vid_conwidth);
@@ -190,14 +190,14 @@ void MapVote_Draw()
 
 	pos_y = ymin;
 	pos_z = 0;
-	//pos_x = center - stringwidth("Vote for a map", false) * 0.5 * 24;
-	pos_x = center - stringwidth(_("Vote for a map"), false, '12 0 0');
-	drawstring(pos, "Vote for a map", '24 24 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+
+	map = _("Vote for a map");
+	pos_x = center - stringwidth(map, false, '12 0 0');
+	drawstring(pos, map, '24 24 0', '1 1 1', 1, DRAWFLAG_NORMAL);
 	pos_y += 26;
 
 	i = ceil(max(0, mv_timeout - time));
 	map = sprintf(_("%d seconds left"), i);
-	//pos_x = center - stringwidth(map, false) * 0.5 * 16;
 	pos_x = center - stringwidth(map, false, '8 0 0');
 	drawstring(pos, map, '16 16 0', '0 1 0', 1, DRAWFLAG_NORMAL);
 	pos_y += 22;
@@ -207,7 +207,7 @@ void MapVote_Draw()
 	ymin = pos_y;
 	if(mv_abstain)
 		mv_num_maps -= 1;
-	
+
 	if(mv_num_maps > 3)
 	{
 		columns = 3;
@@ -242,7 +242,7 @@ void MapVote_Draw()
 
 	if(mv_abstain)
 		++mv_num_maps;
-	
+
 	if(mv_abstain && i < mv_num_maps) {
 		tmp = mv_votes[i];
 		pos_y = ymax + isize - hud_fontsize_y;
@@ -436,7 +436,7 @@ void MapVote_UpdateMask()
 
 	if(oldmask & mv_maps_mask != oldmask)
 		if(oldmask & mv_maps_mask == mv_maps_mask)
-			 sound(world, CHAN_AUTO, "misc_invshot.wav", VOL_BASE, ATTN_NONE);
+			 sound(world, CH_INFO, "misc_invshot.wav", VOL_BASE, ATTN_NONE);
 
 	// remove votes that no longer apply
 	for(i = 0, power = 1; i < mv_num_maps; ++i, power *= 2)