From cc319e01520ed6e525541094caff8c0eea5a3cd4 Mon Sep 17 00:00:00 2001 From: Learath Date: Thu, 25 Apr 2019 15:04:36 +0300 Subject: [PATCH] Fix warnings and style --- src/engine/shared/console.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp index 93b5ec887..3cfd3b494 100644 --- a/src/engine/shared/console.cpp +++ b/src/engine/shared/console.cpp @@ -54,9 +54,9 @@ int CConsole::CResult::GetColor(unsigned Index) if(Len == 4) { unsigned Num = str_toint_base(pStr + 1, 16); - rgb.r = ((Num >> 8) & 0x0F + (Num >> 4) & 0xF0) / 255.0f; - rgb.g = ((Num >> 4) & 0x0F + (Num >> 0) & 0xF0) / 255.0f; - rgb.b = ((Num >> 0) & 0x0F + (Num << 4) & 0xF0) / 255.0f; + rgb.r = (((Num >> 8) & 0x0F) + ((Num >> 4) & 0xF0)) / 255.0f; + rgb.g = (((Num >> 4) & 0x0F) + ((Num >> 0) & 0xF0)) / 255.0f; + rgb.b = (((Num >> 0) & 0x0F) + ((Num << 4) & 0xF0)) / 255.0f; } else if(Len == 7) { @@ -752,9 +752,9 @@ static void ColVariableCommand(IConsole::IResult *pResult, void *pUserData) // do clamping if(pData->m_Min != pData->m_Max) { - if (Val < pData->m_Min) + if(Val < pData->m_Min) Val = pData->m_Min; - if (pData->m_Max != 0 && Val > pData->m_Max) + if(pData->m_Max != 0 && Val > pData->m_Max) Val = pData->m_Max; }