diff options
| author | oy <Tom_Adams@web.de> | 2011-07-11 12:02:45 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-07-11 12:02:45 +0200 |
| commit | f4ce34f01c87e4edbfc085ea60ccec1e3b386f60 (patch) | |
| tree | a01ef93831dbeaa8a754d2afa7ded842fa4520b7 /src | |
| parent | d28108b8ad25476ea5fc05836bea6a35205c7213 (diff) | |
| download | zcatch-f4ce34f01c87e4edbfc085ea60ccec1e3b386f60.tar.gz zcatch-f4ce34f01c87e4edbfc085ea60ccec1e3b386f60.zip | |
close spectator/emoticon menu when changing to team/spectator via bind. Closes #768
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/client/components/emoticon.cpp | 7 | ||||
| -rw-r--r-- | src/game/client/components/spectator.cpp | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/game/client/components/emoticon.cpp b/src/game/client/components/emoticon.cpp index bedfaafb..b2f48b80 100644 --- a/src/game/client/components/emoticon.cpp +++ b/src/game/client/components/emoticon.cpp @@ -102,6 +102,13 @@ void CEmoticon::OnRender() return; } + if(m_pClient->m_Snap.m_SpecInfo.m_Active) + { + m_Active = false; + m_WasActive = false; + return; + } + m_WasActive = true; if (length(m_SelectorMouse) > 140) diff --git a/src/game/client/components/spectator.cpp b/src/game/client/components/spectator.cpp index c69a7669..c09b2ee2 100644 --- a/src/game/client/components/spectator.cpp +++ b/src/game/client/components/spectator.cpp @@ -162,6 +162,13 @@ void CSpectator::OnRender() return; } + if(!m_pClient->m_Snap.m_SpecInfo.m_Active) + { + m_Active = false; + m_WasActive = false; + return; + } + m_WasActive = true; m_SelectedSpectatorID = NO_SELECTION; |