From 13f0d259a5e81ae4e8113df5e98cd1e1ff8f6740 Mon Sep 17 00:00:00 2001 From: Chiller Dragon Date: Fri, 30 Nov 2018 13:27:04 +0100 Subject: [PATCH 1/2] Fix too much indentation --- src/game/client/components/broadcast.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/client/components/broadcast.cpp b/src/game/client/components/broadcast.cpp index 95f9c8915..ccf74220a 100644 --- a/src/game/client/components/broadcast.cpp +++ b/src/game/client/components/broadcast.cpp @@ -56,7 +56,7 @@ void CBroadcast::RenderServerBroadcast() return; if(m_pClient->m_pChat->IsActive()) - return; + return; const float Fade = 1.0f - max(0.0f, (DeltaTime - DisplayStartFade) / (DisplayDuration - DisplayStartFade)); From 148f149af347e9f055894c65c47ea131b99781f9 Mon Sep 17 00:00:00 2001 From: oy Date: Fri, 30 Nov 2018 17:08:20 +0100 Subject: [PATCH 2/2] Update broadcast.cpp --- src/game/client/components/broadcast.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/client/components/broadcast.cpp b/src/game/client/components/broadcast.cpp index 9041ce3e4..5c3cb1171 100644 --- a/src/game/client/components/broadcast.cpp +++ b/src/game/client/components/broadcast.cpp @@ -55,8 +55,8 @@ void CBroadcast::RenderServerBroadcast() if(m_aSrvBroadcastMsg[0] == 0 || DeltaTime > DisplayDuration) return; -if(m_pClient->m_pChat->IsActive() || m_pClient->Client()->State() != IClient::STATE_ONLINE) - return; + if(m_pClient->m_pChat->IsActive() || m_pClient->Client()->State() != IClient::STATE_ONLINE) + return; const float Fade = 1.0f - max(0.0f, (DeltaTime - DisplayStartFade) / (DisplayDuration - DisplayStartFade));