From 072d947804c6e95f4870825df875ca961ff1d6ff Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 6 Jun 2011 21:09:53 +0200 Subject: [PATCH] don't send a vote string when no vote is active --- qcsrc/client/Main.qc | 7 +++++++ qcsrc/server/clientcommands.qc | 3 +++ qcsrc/server/vote.qc | 2 ++ 3 files changed, 12 insertions(+) diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 0cc156391..c9fbc87b1 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -848,6 +848,13 @@ void Ent_Nagger() nags = ReadByte(); + if(!(nags & 4)) + { + if(vote_called_vote) + strunzone(vote_called_vote); + vote_called_vote = string_null; + } + if(nags & 128) { if(vote_called_vote) diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc index 40e0fcd46..f61fecf50 100644 --- a/qcsrc/server/clientcommands.qc +++ b/qcsrc/server/clientcommands.qc @@ -25,6 +25,9 @@ float Nagger_SendEntity(entity to, float sendflags) if(sendflags & 128) nags |= 128; + if(!(nags & 4)) // no vote called? send no string + nags &~= 128; + WriteByte(MSG_ENTITY, nags); if(nags & 128) diff --git a/qcsrc/server/vote.qc b/qcsrc/server/vote.qc index fbc8032bb..bad3eafe4 100644 --- a/qcsrc/server/vote.qc +++ b/qcsrc/server/vote.qc @@ -478,6 +478,8 @@ void VoteReset() { votecalled = FALSE; votecalledmaster = FALSE; votefinished = 0; + votecalledvote = string_null; + votecalledvote_display = string_null; } void VoteAccept() { -- 2.39.2