To vote on a Team Vote you need to use the /teamvote command, but F1 and F2 only
seem to send the /vote command.
I think the functionality from /teamvote should be moved into that of /vote
depending on which type of vote is currently active.
Created attachment 1075[details]
Cmd_Vote_f patch
This patch should do the trick. When there's no global vote, Cmd_Vote_f() now checks for teamvote and if there's one, it calls Cmd_TeamVote_f() before exiting. If there's no vote, it prints error message. If there's both global and team vote, /vote votes in the global one. You'll still have to use /teamvote to vote in teamvote in this case.
I didn't realize that the client actually supports both a team vote and a regular
vote at the same time. This complicates things since we can't hijack the /vote command for /teamvote.
Well, I'm not sure it does, I haven't seen both global and team vote at the same time but it looks like the support should be there. Global votes and team votes use different variables and they don't check aginst each other when they are called.
This is covered by revision 925.
Binds for "teamvote yes" and "teamvote no" can be set in the options menu and the
binds for these commands appear in the vote notification string. They will default to F3 and F4 in the next release (I think).
Created attachment 1075 [details] Cmd_Vote_f patch This patch should do the trick. When there's no global vote, Cmd_Vote_f() now checks for teamvote and if there's one, it calls Cmd_TeamVote_f() before exiting. If there's no vote, it prints error message. If there's both global and team vote, /vote votes in the global one. You'll still have to use /teamvote to vote in teamvote in this case.