edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

After voting only show votes when scoreboard is open

Browse source
This commit is contained in:
def 2013-10-07 12:13:33 +02:00
parent 3a2d196104
commit ffc18b6933
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/client/components/hud.cpp
View file

@ -10,6 +10,7 @@
#include <game/client/gameclient.h> #include <game/client/gameclient.h>
#include <game/client/animstate.h> #include <game/client/animstate.h>
#include <game/client/render.h> #include <game/client/render.h>
#include <game/client/components/scoreboard.h>
#include "controls.h" #include "controls.h"
#include "camera.h" #include "camera.h"
@ -324,7 +325,7 @@ void CHud::RenderTeambalanceWarning()
void CHud::RenderVoting() void CHud::RenderVoting()
{ {
if(!m_pClient->m_pVoting->IsVoting() || Client()->State() == IClient::STATE_DEMOPLAYBACK) if((!m_pClient->m_pScoreboard->Active() && m_pClient->m_pVoting->TakenChoice()) || !m_pClient->m_pVoting->IsVoting() || Client()->State() == IClient::STATE_DEMOPLAYBACK)
return; return;
Graphics()->TextureSet(-1); Graphics()->TextureSet(-1);

1
src/game/client/components/voting.cpp
View file

@ -113,6 +113,7 @@ void CVoting::AddvoteOption(const char *pDescription, const char *pCommand)
void CVoting::Vote(int v) void CVoting::Vote(int v)
{ {
m_Voted = v;
CNetMsg_Cl_Vote Msg = {v}; CNetMsg_Cl_Vote Msg = {v};
Client()->SendPackMsg(&Msg, MSGFLAG_VITAL); Client()->SendPackMsg(&Msg, MSGFLAG_VITAL);
} }