diff options
Diffstat (limited to 'src/game/client/components/emoticon.cpp')
| -rw-r--r-- | src/game/client/components/emoticon.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/game/client/components/emoticon.cpp b/src/game/client/components/emoticon.cpp index 741a604f..9e2a80cf 100644 --- a/src/game/client/components/emoticon.cpp +++ b/src/game/client/components/emoticon.cpp @@ -54,6 +54,7 @@ bool CEmoticon::OnMouseMove(float x, float y) if(!m_Active) return false; + UI()->ConvertMouseMove(&x, &y); m_SelectorMouse += vec2(x,y); return true; } @@ -101,16 +102,23 @@ 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) - m_SelectorMouse = normalize(m_SelectorMouse) * 140; + if (length(m_SelectorMouse) > 170.0f) + m_SelectorMouse = normalize(m_SelectorMouse) * 170.0f; float SelectedAngle = GetAngle(m_SelectorMouse) + 2*pi/24; if (SelectedAngle < 0) SelectedAngle += 2*pi; - if (length(m_SelectorMouse) > 100) + if (length(m_SelectorMouse) > 110.0f) m_SelectedEmote = (int)(SelectedAngle / (2*pi) * NUM_EMOTICONS); CUIRect Screen = *UI()->Screen(); @@ -122,7 +130,7 @@ void CEmoticon::OnRender() Graphics()->TextureSet(-1); Graphics()->QuadsBegin(); Graphics()->SetColor(0,0,0,0.3f); - DrawCircle(Screen.w/2, Screen.h/2, 160, 64); + DrawCircle(Screen.w/2, Screen.h/2, 190.0f, 64); Graphics()->QuadsEnd(); Graphics()->TextureSet(g_pData->m_aImages[IMAGE_EMOTICONS].m_Id); @@ -136,10 +144,10 @@ void CEmoticon::OnRender() bool Selected = m_SelectedEmote == i; - float Size = Selected ? 80 : 32; + float Size = Selected ? 80.0f : 50.0f; - float NudgeX = 120 * cosf(Angle); - float NudgeY = 120 * sinf(Angle); + float NudgeX = 150.0f * cosf(Angle); + float NudgeY = 150.0f * sinf(Angle); RenderTools()->SelectSprite(SPRITE_OOP + i); IGraphics::CQuadItem QuadItem(Screen.w/2 + NudgeX, Screen.h/2 + NudgeY, Size, Size); Graphics()->QuadsDraw(&QuadItem, 1); |