From: Samual <samual@xonotic.org>
Date: Mon, 15 Aug 2011 06:41:17 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into terencehill/centerprint_stuff
X-Git-Tag: xonotic-v0.5.0~148
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5a593d8425521092f05949c4143d86a25d49f4c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into terencehill/centerprint_stuff
---

b5a593d8425521092f05949c4143d86a25d49f4c
diff --cc qcsrc/server/vote.qc
index ebb11a64d,1690cf437..65468a3b6
--- a/qcsrc/server/vote.qc
+++ b/qcsrc/server/vote.qc
@@@ -284,9 -268,9 +268,8 @@@ float GameCommand_Vote(string s, entit
  			} else if(e.vote_vote == 0
  				  || autocvar_sv_vote_change) {
  				msg_entity = e;
- 				VoteDialog_UpdateHighlight(1);
  				print_to(e, "^1You accepted the vote.");
  				e.vote_vote = 1;
 -				centerprint_expire(e, CENTERPRIO_VOTE);
  				if(!autocvar_sv_vote_singlecount) {
  					VoteCount();
  				}
@@@ -301,9 -285,9 +284,8 @@@
  			} else if(e.vote_vote == 0
  				  || autocvar_sv_vote_change) {
  				msg_entity = e;
- 				VoteDialog_UpdateHighlight(2);
  				print_to(e, "^1You rejected the vote.");
  				e.vote_vote = -1;
 -				centerprint_expire(e, CENTERPRIO_VOTE);
  				if(!autocvar_sv_vote_singlecount) {
  					VoteCount();
  				}
@@@ -318,9 -302,9 +300,8 @@@
  			} else if(e.vote_vote == 0
  				  || autocvar_sv_vote_change) {
  				msg_entity = e;
- 				VoteDialog_UpdateHighlight(3);
  				print_to(e, "^1You abstained from your vote.");
  				e.vote_vote = -2;
 -				centerprint_expire(e, CENTERPRIO_VOTE);
  				if(!autocvar_sv_vote_singlecount) {
  					VoteCount();
  				}