edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1981

Browse source 
1981: Fix: background colors being set to white r=def- a=Aerll

After changing either of background colors in ddnet tab in settings and reopening the client, both become white.

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
This commit is contained in:
bors[bot] 2019-12-10 12:34:48 +00:00 committed by GitHub
parent 709681604d ff685ac1e0
commit 4a83a42f14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/shared/console.cpp
View file

@ -46,7 +46,7 @@ ColorHSLA CConsole::CResult::GetColor(unsigned Index, bool Light)
const char *pStr = m_apArgs[Index]; const char *pStr = m_apArgs[Index];
if(str_isallnum(pStr) || ((pStr[0] == '-' || pStr[0] == '+') && str_isallnum(pStr+1))) // Teeworlds Color (Packed HSL) if(str_isallnum(pStr) || ((pStr[0] == '-' || pStr[0] == '+') && str_isallnum(pStr+1))) // Teeworlds Color (Packed HSL)
{ {
hsl = ColorHSLA(str_toint(pStr), true); hsl = ColorHSLA(str_toulong_base(pStr, 10), true);
} }
else if(*pStr == '$') // Hex RGB else if(*pStr == '$') // Hex RGB
{ {