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

Merge #3042

Browse source 
3042: Use renderinfo for player death effect r=def- a=Jupeyy

the render info color is created the same way, just that it is allowed to be overritten for team colors
see OnNewSnapshot
and UpdateRenderInfo

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2020-10-08 20:42:48 +00:00 committed by GitHub
parent b2b3b866cd 94a20d11fa
commit 0d581c454e
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/game/client/components/effects.cpp
View file

@ -167,7 +167,7 @@ void CEffects::PlayerDeath(vec2 Pos, int ClientID)
if(ClientID >= 0)
{
if(m_pClient->m_aClients[ClientID].m_UseCustomColor)
BloodColor = color_cast<ColorRGBA>(ColorHSLA(m_pClient->m_aClients[ClientID].m_ColorBody).UnclampLighting(0.5f));
BloodColor = m_pClient->m_aClients[ClientID].m_RenderInfo.m_ColorBody;
else
{
const CSkins::CSkin *s = m_pClient->m_pSkins->Get(m_pClient->m_aClients[ClientID].m_SkinID);