From 80c2f3c7d4092618e9f7a4bee61a2c81944f6713 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 3 Oct 2018 03:24:22 +1000 Subject: [PATCH] Only play 'vote now' announcement if the vote hasn't already passed --- qcsrc/server/command/vote.qc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 1cb26d1fd..51cf55ce3 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -835,14 +835,15 @@ void VoteCommand_call(int request, entity caller, int argc, string vote_command) } FOREACH_CLIENT(IS_REAL_CLIENT(it), { ++tmp_playercount; }); - if (tmp_playercount > 1) - Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_VOTE_CALL); bprint("\{1}^2* ^3", OriginalCallerName(), "^2 calls a vote for ", vote_called_display, "\n"); if (autocvar_sv_eventlog) GameLogEcho(strcat(":vote:vcall:", ftos(vote_caller.playerid), ":", vote_called_display)); Nagger_VoteChanged(); VoteCount(true); // needed if you are the only one + + if (tmp_playercount > 1 && vote_called != VOTE_NULL) + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_VOTE_CALL); } return; -- 2.39.2