From 4f7a52184a850a0397f12feea43d5d23a93d80a0 Mon Sep 17 00:00:00 2001 From: oy Date: Tue, 25 Dec 2018 09:18:31 +0100 Subject: [PATCH] fixed disabling the xmas hats. closes #1929 --- src/game/client/gameclient.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index 3812fffbb..425f2d9be 100644 --- a/src/game/client/gameclient.cpp +++ b/src/game/client/gameclient.cpp @@ -1371,12 +1371,15 @@ void CGameClient::CClientData::UpdateRenderInfo(CGameClient *pGameClient, int Cl else m_SkinPartIDs[p] = ID; } - else if(m_SkinInfo.m_HatTexture.IsValid()) + else { - if(p == SKINPART_BODY && str_comp(m_aaSkinPartNames[p], "standard")) - m_SkinInfo.m_HatSpriteIndex = CSkins::HAT_OFFSET_SIDE+(ClientID%CSkins::HAT_NUM); - if(p == SKINPART_DECORATION && !str_comp(m_aaSkinPartNames[p], "twinbopp")) - m_SkinInfo.m_HatSpriteIndex = CSkins::HAT_OFFSET_SIDE+(ClientID%CSkins::HAT_NUM); + if(m_SkinInfo.m_HatTexture.IsValid()) + { + if(p == SKINPART_BODY && str_comp(m_aaSkinPartNames[p], "standard")) + m_SkinInfo.m_HatSpriteIndex = CSkins::HAT_OFFSET_SIDE + (ClientID%CSkins::HAT_NUM); + if(p == SKINPART_DECORATION && !str_comp(m_aaSkinPartNames[p], "twinbopp")) + m_SkinInfo.m_HatSpriteIndex = CSkins::HAT_OFFSET_SIDE + (ClientID%CSkins::HAT_NUM); + } m_SkinPartIDs[p] = ID; }