From 7648ba30246ca8a692c27328145225535b8f300e Mon Sep 17 00:00:00 2001 From: oy Date: Sun, 3 Jul 2011 00:36:07 +0200 Subject: added a different mouse sens for menus/editor --- src/game/client/components/spectator.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/game/client/components/spectator.cpp') diff --git a/src/game/client/components/spectator.cpp b/src/game/client/components/spectator.cpp index e98df118..c69a7669 100644 --- a/src/game/client/components/spectator.cpp +++ b/src/game/client/components/spectator.cpp @@ -139,6 +139,7 @@ bool CSpectator::OnMouseMove(float x, float y) if(!m_Active) return false; + UI()->ConvertMouseMove(&x, &y); m_SelectorMouse += vec2(x,y); return true; } -- cgit 1.4.1 From f4ce34f01c87e4edbfc085ea60ccec1e3b386f60 Mon Sep 17 00:00:00 2001 From: oy Date: Mon, 11 Jul 2011 12:02:45 +0200 Subject: close spectator/emoticon menu when changing to team/spectator via bind. Closes #768 --- src/game/client/components/emoticon.cpp | 7 +++++++ src/game/client/components/spectator.cpp | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'src/game/client/components/spectator.cpp') 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; -- cgit 1.4.1