int mv_mouse_selection;
int mv_selection_keyboard;
-float gametypevote;
+bool gametypevote;
string mapvote_chosenmap;
vector gtv_text_size;
vector gtv_text_size_small;
else
DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), dist.y, dist.x, map, "", tmp, i);
}
+
+ if(mv_abstain)
+ ++mv_num_maps;
+
+ if(mv_abstain && i < mv_num_maps) {
+ tmp = mv_votes[i];
+ pos.y = ymax + abstain_spacing;
+ pos.x = (xmax + xmin) * 0.5;
+ MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i);
+ }
+
if (mv_winner)
{
// expand winner map image
MapVote_DrawMapPicture(mv_pics[mv_winner - 1], img_pos, img_size, theAlpha);
}
-
- if(mv_abstain)
- ++mv_num_maps;
-
- if(mv_abstain && i < mv_num_maps) {
- tmp = mv_votes[i];
- pos.y = ymax + abstain_spacing;
- pos.x = (xmax+xmin)*0.5;
- MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i);
- }
}
void Cmd_MapVote_MapDownload(int argc)
mv_ownvote = -1;
mv_timeout = ReadCoord();
- gametypevote = ReadByte();
-
- if(gametypevote)
- {
+ int gametypevote_flags = ReadByte();
+ gametypevote = boolean(gametypevote_flags & BIT(0));
+ if(gametypevote_flags)
mapvote_chosenmap = strzone(ReadString());
- if ( gametypevote == 2 )
- gametypevote = 0;
- }
MapVote_ReadMask();
int i;
TC(int, bInputType);
static int first_digit = 0;
- if (!mv_active)
+ if (!mv_active || isdemo())
return false;
if(bInputType == 3)