Merge branch 'master' into terencehill/quickmenu

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / mapvoting.qh

diff --git a/qcsrc/client/mapvoting.qh b/qcsrc/client/mapvoting.qh
index d8ace5549fe98f017a6644d2b5da8ed7e94b164e..2c3c58eef096f4a9fbdc7b23c7fa848351e0cb10 100644 (file)
--- a/qcsrc/client/mapvoting.qh
+++ b/qcsrc/client/mapvoting.qh
@@ -3,7 +3,6 @@
 
 int mv_num_maps;
 
-float mv_active;
 string mv_maps[MAPVOTE_COUNT];
 string mv_pics[MAPVOTE_COUNT];
 string mv_pk3[MAPVOTE_COUNT];
@@ -32,7 +31,7 @@ vector gtv_text_size_small;
 
 string MapVote_FormatMapItem(int id, string map, float count, float maxwidth, vector fontsize);
 
-string GameTypeVote_DescriptionByID(float id);
+string GameTypeVote_DescriptionByID(int id);
 
 vector MapVote_RGB(int id);
 
@@ -78,4 +77,4 @@ void MapVote_UpdateVotes();
 void Ent_MapVote();
 
 void Net_MapVote_Picture();
-#endif
\ No newline at end of file
+#endif