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

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / vote.qc

diff --git a/qcsrc/server/vote.qc b/qcsrc/server/vote.qc
index 1690cf437b828c9f91538af05a4b982ab0827caf..65468a3b6204c750a5ff0fac0473b97778131c18 100644 (file)
--- a/qcsrc/server/vote.qc
+++ b/qcsrc/server/vote.qc
@@ -270,7 +270,6 @@ float GameCommand_Vote(string s, entity e) {
                                msg_entity = e;
                                print_to(e, "^1You accepted the vote.");
                                e.vote_vote = 1;
-                               centerprint_expire(e, CENTERPRIO_VOTE);
                                if(!autocvar_sv_vote_singlecount) {
                                        VoteCount();
                                }
@@ -287,7 +286,6 @@ float GameCommand_Vote(string s, entity e) {
                                msg_entity = e;
                                print_to(e, "^1You rejected the vote.");
                                e.vote_vote = -1;
-                               centerprint_expire(e, CENTERPRIO_VOTE);
                                if(!autocvar_sv_vote_singlecount) {
                                        VoteCount();
                                }
@@ -304,7 +302,6 @@ float GameCommand_Vote(string s, entity e) {
                                msg_entity = e;
                                print_to(e, "^1You abstained from your vote.");
                                e.vote_vote = -2;
-                               centerprint_expire(e, CENTERPRIO_VOTE);
                                if(!autocvar_sv_vote_singlecount) {
                                        VoteCount();
                                }
@@ -447,7 +444,6 @@ void VoteReset() {
        FOR_EACH_CLIENT(player)
        {
                player.vote_vote = 0;
-               centerprint_expire(player, CENTERPRIO_VOTE);
        }
 
        if(votecalled)