mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 01:24:18 +00:00
Compare commits
1 commit
0d993d65c2
...
056ebaff4f
Author | SHA1 | Date | |
---|---|---|---|
056ebaff4f |
|
@ -424,10 +424,7 @@ void CServerBrowserHttp::Refresh()
|
||||||
}
|
}
|
||||||
bool ServerbrowserParseUrl(NETADDR *pOut, const char *pUrl)
|
bool ServerbrowserParseUrl(NETADDR *pOut, const char *pUrl)
|
||||||
{
|
{
|
||||||
int Failure = net_addr_from_url(pOut, pUrl, nullptr, 0);
|
return net_addr_from_url(pOut, pUrl, nullptr, 0) != 0;
|
||||||
if(Failure || pOut->port == 0)
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
bool CServerBrowserHttp::Validate(json_value *pJson)
|
bool CServerBrowserHttp::Validate(json_value *pJson)
|
||||||
{
|
{
|
||||||
|
|
|
@ -61,7 +61,6 @@ public:
|
||||||
virtual void BindInt(int Idx, int Value) = 0;
|
virtual void BindInt(int Idx, int Value) = 0;
|
||||||
virtual void BindInt64(int Idx, int64_t Value) = 0;
|
virtual void BindInt64(int Idx, int64_t Value) = 0;
|
||||||
virtual void BindFloat(int Idx, float Value) = 0;
|
virtual void BindFloat(int Idx, float Value) = 0;
|
||||||
virtual void BindNull(int Idx) = 0;
|
|
||||||
|
|
||||||
// Print expanded sql statement
|
// Print expanded sql statement
|
||||||
virtual void Print() = 0;
|
virtual void Print() = 0;
|
||||||
|
|
|
@ -89,7 +89,6 @@ public:
|
||||||
void BindInt(int Idx, int Value) override;
|
void BindInt(int Idx, int Value) override;
|
||||||
void BindInt64(int Idx, int64_t Value) override;
|
void BindInt64(int Idx, int64_t Value) override;
|
||||||
void BindFloat(int Idx, float Value) override;
|
void BindFloat(int Idx, float Value) override;
|
||||||
void BindNull(int Idx) override;
|
|
||||||
|
|
||||||
void Print() override {}
|
void Print() override {}
|
||||||
bool Step(bool *pEnd, char *pError, int ErrorSize) override;
|
bool Step(bool *pEnd, char *pError, int ErrorSize) override;
|
||||||
|
@ -422,22 +421,6 @@ void CMysqlConnection::BindFloat(int Idx, float Value)
|
||||||
pParam->error = nullptr;
|
pParam->error = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMysqlConnection::BindNull(int Idx)
|
|
||||||
{
|
|
||||||
m_NewQuery = true;
|
|
||||||
Idx -= 1;
|
|
||||||
dbg_assert(0 <= Idx && Idx < (int)m_vStmtParameters.size(), "index out of bounds");
|
|
||||||
|
|
||||||
MYSQL_BIND *pParam = &m_vStmtParameters[Idx];
|
|
||||||
pParam->buffer_type = MYSQL_TYPE_NULL;
|
|
||||||
pParam->buffer = nullptr;
|
|
||||||
pParam->buffer_length = 0;
|
|
||||||
pParam->length = nullptr;
|
|
||||||
pParam->is_null = nullptr;
|
|
||||||
pParam->is_unsigned = false;
|
|
||||||
pParam->error = nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CMysqlConnection::Step(bool *pEnd, char *pError, int ErrorSize)
|
bool CMysqlConnection::Step(bool *pEnd, char *pError, int ErrorSize)
|
||||||
{
|
{
|
||||||
if(m_NewQuery)
|
if(m_NewQuery)
|
||||||
|
|
|
@ -37,7 +37,6 @@ public:
|
||||||
void BindInt(int Idx, int Value) override;
|
void BindInt(int Idx, int Value) override;
|
||||||
void BindInt64(int Idx, int64_t Value) override;
|
void BindInt64(int Idx, int64_t Value) override;
|
||||||
void BindFloat(int Idx, float Value) override;
|
void BindFloat(int Idx, float Value) override;
|
||||||
void BindNull(int Idx) override;
|
|
||||||
|
|
||||||
void Print() override;
|
void Print() override;
|
||||||
bool Step(bool *pEnd, char *pError, int ErrorSize) override;
|
bool Step(bool *pEnd, char *pError, int ErrorSize) override;
|
||||||
|
@ -242,13 +241,6 @@ void CSqliteConnection::BindFloat(int Idx, float Value)
|
||||||
m_Done = false;
|
m_Done = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CSqliteConnection::BindNull(int Idx)
|
|
||||||
{
|
|
||||||
int Result = sqlite3_bind_null(m_pStmt, Idx);
|
|
||||||
AssertNoError(Result);
|
|
||||||
m_Done = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Keep support for SQLite < 3.14 on older Linux distributions. MinGW does not
|
// Keep support for SQLite < 3.14 on older Linux distributions. MinGW does not
|
||||||
// support __attribute__((weak)): https://sourceware.org/bugzilla/show_bug.cgi?id=9687
|
// support __attribute__((weak)): https://sourceware.org/bugzilla/show_bug.cgi?id=9687
|
||||||
#if defined(__GNUC__) && !defined(__MINGW32__)
|
#if defined(__GNUC__) && !defined(__MINGW32__)
|
||||||
|
|
|
@ -805,9 +805,50 @@ void CChat::AddLine(int ClientId, int Team, const char *pLine)
|
||||||
{
|
{
|
||||||
if(!g_Config.m_ClChatOld)
|
if(!g_Config.m_ClChatOld)
|
||||||
{
|
{
|
||||||
|
pCurrentLine->m_CustomColoredSkin = LineAuthor.m_RenderInfo.m_CustomColoredSkin;
|
||||||
|
if(pCurrentLine->m_CustomColoredSkin)
|
||||||
|
pCurrentLine->m_RenderSkin = LineAuthor.m_RenderInfo.m_ColorableRenderSkin;
|
||||||
|
else
|
||||||
|
pCurrentLine->m_RenderSkin = LineAuthor.m_RenderInfo.m_OriginalRenderSkin;
|
||||||
|
|
||||||
str_copy(pCurrentLine->m_aSkinName, LineAuthor.m_aSkinName);
|
str_copy(pCurrentLine->m_aSkinName, LineAuthor.m_aSkinName);
|
||||||
pCurrentLine->m_TeeRenderInfo = LineAuthor.m_RenderInfo;
|
pCurrentLine->m_ColorBody = LineAuthor.m_RenderInfo.m_ColorBody;
|
||||||
|
pCurrentLine->m_ColorFeet = LineAuthor.m_RenderInfo.m_ColorFeet;
|
||||||
|
|
||||||
|
pCurrentLine->m_RenderSkinMetrics = LineAuthor.m_RenderInfo.m_SkinMetrics;
|
||||||
pCurrentLine->m_HasRenderTee = true;
|
pCurrentLine->m_HasRenderTee = true;
|
||||||
|
|
||||||
|
// 0.7
|
||||||
|
if(Client()->IsSixup())
|
||||||
|
{
|
||||||
|
for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
|
||||||
|
{
|
||||||
|
const char *pPartName = LineAuthor.m_aSixup[g_Config.m_ClDummy].m_aaSkinPartNames[Part];
|
||||||
|
int Id = m_pClient->m_Skins7.FindSkinPart(Part, pPartName, false);
|
||||||
|
const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(Part, Id);
|
||||||
|
if(LineAuthor.m_aSixup[g_Config.m_ClDummy].m_aUseCustomColors[Part])
|
||||||
|
{
|
||||||
|
pCurrentLine->m_Sixup.m_aTextures[Part] = pSkinPart->m_ColorTexture;
|
||||||
|
pCurrentLine->m_Sixup.m_aColors[Part] = m_pClient->m_Skins7.GetColor(
|
||||||
|
LineAuthor.m_aSixup[g_Config.m_ClDummy].m_aSkinPartColors[Part],
|
||||||
|
Part == protocol7::SKINPART_MARKING);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
pCurrentLine->m_Sixup.m_aTextures[Part] = pSkinPart->m_OrgTexture;
|
||||||
|
pCurrentLine->m_Sixup.m_aColors[Part] = vec4(1.0f, 1.0f, 1.0f, 1.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(LineAuthor.m_SkinInfo.m_aSixup[g_Config.m_ClDummy].m_HatTexture.IsValid())
|
||||||
|
{
|
||||||
|
if(Part == protocol7::SKINPART_BODY && str_comp(pPartName, "standard"))
|
||||||
|
pCurrentLine->m_Sixup.m_HatSpriteIndex = CSkins7::HAT_OFFSET_SIDE + (ClientId % CSkins7::HAT_NUM);
|
||||||
|
if(Part == protocol7::SKINPART_DECORATION && str_comp(pPartName, "twinbopp"))
|
||||||
|
pCurrentLine->m_Sixup.m_HatSpriteIndex = CSkins7::HAT_OFFSET_SIDE + (ClientId % CSkins7::HAT_NUM);
|
||||||
|
pCurrentLine->m_Sixup.m_HatTexture = LineAuthor.m_SkinInfo.m_aSixup[g_Config.m_ClDummy].m_HatTexture;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -876,11 +917,17 @@ void CChat::OnRefreshSkins()
|
||||||
{
|
{
|
||||||
if(Line.m_HasRenderTee)
|
if(Line.m_HasRenderTee)
|
||||||
{
|
{
|
||||||
Line.m_TeeRenderInfo.Apply(m_pClient->m_Skins.Find(Line.m_aSkinName));
|
const CSkin *pSkin = m_pClient->m_Skins.Find(Line.m_aSkinName);
|
||||||
|
if(Line.m_CustomColoredSkin)
|
||||||
|
Line.m_RenderSkin = pSkin->m_ColorableSkin;
|
||||||
|
else
|
||||||
|
Line.m_RenderSkin = pSkin->m_OriginalSkin;
|
||||||
|
|
||||||
|
Line.m_RenderSkinMetrics = pSkin->m_Metrics;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Line.m_TeeRenderInfo.Reset();
|
Line.m_RenderSkin.Reset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1244,7 +1291,28 @@ void CChat::OnRender()
|
||||||
if(!g_Config.m_ClChatOld && Line.m_HasRenderTee)
|
if(!g_Config.m_ClChatOld && Line.m_HasRenderTee)
|
||||||
{
|
{
|
||||||
const int TeeSize = MessageTeeSize();
|
const int TeeSize = MessageTeeSize();
|
||||||
Line.m_TeeRenderInfo.m_Size = TeeSize;
|
CTeeRenderInfo RenderInfo;
|
||||||
|
RenderInfo.m_CustomColoredSkin = Line.m_CustomColoredSkin;
|
||||||
|
if(Line.m_CustomColoredSkin)
|
||||||
|
RenderInfo.m_ColorableRenderSkin = Line.m_RenderSkin;
|
||||||
|
else
|
||||||
|
RenderInfo.m_OriginalRenderSkin = Line.m_RenderSkin;
|
||||||
|
RenderInfo.m_SkinMetrics = Line.m_RenderSkinMetrics;
|
||||||
|
|
||||||
|
RenderInfo.m_ColorBody = Line.m_ColorBody;
|
||||||
|
RenderInfo.m_ColorFeet = Line.m_ColorFeet;
|
||||||
|
RenderInfo.m_Size = TeeSize;
|
||||||
|
|
||||||
|
if(Client()->IsSixup())
|
||||||
|
{
|
||||||
|
for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
|
||||||
|
{
|
||||||
|
RenderInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = Line.m_Sixup.m_aColors[Part];
|
||||||
|
RenderInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = Line.m_Sixup.m_aTextures[Part];
|
||||||
|
RenderInfo.m_aSixup[g_Config.m_ClDummy].m_HatSpriteIndex = Line.m_Sixup.m_HatSpriteIndex;
|
||||||
|
RenderInfo.m_aSixup[g_Config.m_ClDummy].m_HatTexture = Line.m_Sixup.m_HatTexture;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
float RowHeight = FontSize() + RealMsgPaddingY;
|
float RowHeight = FontSize() + RealMsgPaddingY;
|
||||||
float OffsetTeeY = TeeSize / 2.0f;
|
float OffsetTeeY = TeeSize / 2.0f;
|
||||||
|
@ -1252,9 +1320,9 @@ void CChat::OnRender()
|
||||||
|
|
||||||
const CAnimState *pIdleState = CAnimState::GetIdle();
|
const CAnimState *pIdleState = CAnimState::GetIdle();
|
||||||
vec2 OffsetToMid;
|
vec2 OffsetToMid;
|
||||||
CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &Line.m_TeeRenderInfo, OffsetToMid);
|
CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &RenderInfo, OffsetToMid);
|
||||||
vec2 TeeRenderPos(x + (RealMsgPaddingX + TeeSize) / 2.0f, y + OffsetTeeY + FullHeightMinusTee / 2.0f + OffsetToMid.y);
|
vec2 TeeRenderPos(x + (RealMsgPaddingX + TeeSize) / 2.0f, y + OffsetTeeY + FullHeightMinusTee / 2.0f + OffsetToMid.y);
|
||||||
RenderTools()->RenderTee(pIdleState, &Line.m_TeeRenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), TeeRenderPos, Blend);
|
RenderTools()->RenderTee(pIdleState, &RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), TeeRenderPos, Blend);
|
||||||
}
|
}
|
||||||
|
|
||||||
const ColorRGBA TextColor = TextRender()->DefaultTextColor().WithMultipliedAlpha(Blend);
|
const ColorRGBA TextColor = TextRender()->DefaultTextColor().WithMultipliedAlpha(Blend);
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
|
|
||||||
#include <game/client/component.h>
|
#include <game/client/component.h>
|
||||||
#include <game/client/lineinput.h>
|
#include <game/client/lineinput.h>
|
||||||
#include <game/client/render.h>
|
|
||||||
#include <game/client/skin.h>
|
#include <game/client/skin.h>
|
||||||
#include <game/generated/protocol7.h>
|
#include <game/generated/protocol7.h>
|
||||||
|
|
||||||
|
@ -46,12 +45,30 @@ class CChat : public CComponent
|
||||||
int m_QuadContainerIndex;
|
int m_QuadContainerIndex;
|
||||||
|
|
||||||
char m_aSkinName[std::size(g_Config.m_ClPlayerSkin)];
|
char m_aSkinName[std::size(g_Config.m_ClPlayerSkin)];
|
||||||
bool m_HasRenderTee;
|
CSkin::SSkinTextures m_RenderSkin;
|
||||||
CTeeRenderInfo m_TeeRenderInfo;
|
CSkin::SSkinMetrics m_RenderSkinMetrics;
|
||||||
|
bool m_CustomColoredSkin;
|
||||||
|
ColorRGBA m_ColorBody;
|
||||||
|
ColorRGBA m_ColorFeet;
|
||||||
|
|
||||||
|
bool m_HasRenderTee;
|
||||||
float m_TextYOffset;
|
float m_TextYOffset;
|
||||||
|
|
||||||
int m_TimesRepeated;
|
int m_TimesRepeated;
|
||||||
|
|
||||||
|
class CSixup
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
IGraphics::CTextureHandle m_aTextures[protocol7::NUM_SKINPARTS];
|
||||||
|
IGraphics::CTextureHandle m_HatTexture;
|
||||||
|
IGraphics::CTextureHandle m_BotTexture;
|
||||||
|
int m_HatSpriteIndex;
|
||||||
|
ColorRGBA m_BotColor;
|
||||||
|
ColorRGBA m_aColors[protocol7::NUM_SKINPARTS];
|
||||||
|
};
|
||||||
|
|
||||||
|
// 0.7 Skin
|
||||||
|
CSixup m_Sixup;
|
||||||
};
|
};
|
||||||
|
|
||||||
bool m_PrevScoreBoardShowed;
|
bool m_PrevScoreBoardShowed;
|
||||||
|
|
|
@ -366,7 +366,10 @@ void CGhost::OnRender()
|
||||||
IsTeamplay = (m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS) != 0;
|
IsTeamplay = (m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS) != 0;
|
||||||
|
|
||||||
GhostNinjaRenderInfo = Ghost.m_RenderInfo;
|
GhostNinjaRenderInfo = Ghost.m_RenderInfo;
|
||||||
GhostNinjaRenderInfo.Apply(pSkin);
|
GhostNinjaRenderInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
|
||||||
|
GhostNinjaRenderInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
|
||||||
|
GhostNinjaRenderInfo.m_BloodColor = pSkin->m_BloodColor;
|
||||||
|
GhostNinjaRenderInfo.m_SkinMetrics = pSkin->m_Metrics;
|
||||||
GhostNinjaRenderInfo.m_CustomColoredSkin = IsTeamplay;
|
GhostNinjaRenderInfo.m_CustomColoredSkin = IsTeamplay;
|
||||||
if(!IsTeamplay)
|
if(!IsTeamplay)
|
||||||
{
|
{
|
||||||
|
@ -389,7 +392,11 @@ void CGhost::InitRenderInfos(CGhostItem *pGhost)
|
||||||
IntsToStr(&pGhost->m_Skin.m_Skin0, 6, aSkinName, std::size(aSkinName));
|
IntsToStr(&pGhost->m_Skin.m_Skin0, 6, aSkinName, std::size(aSkinName));
|
||||||
CTeeRenderInfo *pRenderInfo = &pGhost->m_RenderInfo;
|
CTeeRenderInfo *pRenderInfo = &pGhost->m_RenderInfo;
|
||||||
|
|
||||||
pRenderInfo->Apply(m_pClient->m_Skins.Find(aSkinName));
|
const CSkin *pSkin = m_pClient->m_Skins.Find(aSkinName);
|
||||||
|
pRenderInfo->m_OriginalRenderSkin = pSkin->m_OriginalSkin;
|
||||||
|
pRenderInfo->m_ColorableRenderSkin = pSkin->m_ColorableSkin;
|
||||||
|
pRenderInfo->m_BloodColor = pSkin->m_BloodColor;
|
||||||
|
pRenderInfo->m_SkinMetrics = pSkin->m_Metrics;
|
||||||
pRenderInfo->m_CustomColoredSkin = pGhost->m_Skin.m_UseCustomColor;
|
pRenderInfo->m_CustomColoredSkin = pGhost->m_Skin.m_UseCustomColor;
|
||||||
if(pGhost->m_Skin.m_UseCustomColor)
|
if(pGhost->m_Skin.m_UseCustomColor)
|
||||||
{
|
{
|
||||||
|
@ -690,7 +697,11 @@ void CGhost::OnRefreshSkins()
|
||||||
CTeeRenderInfo *pRenderInfo = &Ghost.m_RenderInfo;
|
CTeeRenderInfo *pRenderInfo = &Ghost.m_RenderInfo;
|
||||||
if(aSkinName[0] != '\0')
|
if(aSkinName[0] != '\0')
|
||||||
{
|
{
|
||||||
pRenderInfo->Apply(m_pClient->m_Skins.Find(aSkinName));
|
const CSkin *pSkin = m_pClient->m_Skins.Find(aSkinName);
|
||||||
|
pRenderInfo->m_OriginalRenderSkin = pSkin->m_OriginalSkin;
|
||||||
|
pRenderInfo->m_ColorableRenderSkin = pSkin->m_ColorableSkin;
|
||||||
|
pRenderInfo->m_BloodColor = pSkin->m_BloodColor;
|
||||||
|
pRenderInfo->m_SkinMetrics = pSkin->m_Metrics;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -1822,8 +1822,12 @@ bool CMenus::PrintHighlighted(const char *pName, F &&PrintFn)
|
||||||
|
|
||||||
CTeeRenderInfo CMenus::GetTeeRenderInfo(vec2 Size, const char *pSkinName, bool CustomSkinColors, int CustomSkinColorBody, int CustomSkinColorFeet) const
|
CTeeRenderInfo CMenus::GetTeeRenderInfo(vec2 Size, const char *pSkinName, bool CustomSkinColors, int CustomSkinColorBody, int CustomSkinColorFeet) const
|
||||||
{
|
{
|
||||||
|
const CSkin *pSkin = m_pClient->m_Skins.Find(pSkinName);
|
||||||
|
|
||||||
CTeeRenderInfo TeeInfo;
|
CTeeRenderInfo TeeInfo;
|
||||||
TeeInfo.Apply(m_pClient->m_Skins.Find(pSkinName));
|
TeeInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
|
||||||
|
TeeInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
|
||||||
|
TeeInfo.m_SkinMetrics = pSkin->m_Metrics;
|
||||||
TeeInfo.m_CustomColoredSkin = CustomSkinColors;
|
TeeInfo.m_CustomColoredSkin = CustomSkinColors;
|
||||||
if(CustomSkinColors)
|
if(CustomSkinColors)
|
||||||
{
|
{
|
||||||
|
|
|
@ -633,8 +633,11 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
|
||||||
|
|
||||||
// Note: get the skin info after the settings buttons, because they can trigger a refresh
|
// Note: get the skin info after the settings buttons, because they can trigger a refresh
|
||||||
// which invalidates the skin.
|
// which invalidates the skin.
|
||||||
|
const CSkin *pSkin = m_pClient->m_Skins.Find(pSkinName);
|
||||||
CTeeRenderInfo OwnSkinInfo;
|
CTeeRenderInfo OwnSkinInfo;
|
||||||
OwnSkinInfo.Apply(m_pClient->m_Skins.Find(pSkinName));
|
OwnSkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
|
||||||
|
OwnSkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
|
||||||
|
OwnSkinInfo.m_SkinMetrics = pSkin->m_Metrics;
|
||||||
OwnSkinInfo.m_CustomColoredSkin = *pUseCustomColor;
|
OwnSkinInfo.m_CustomColoredSkin = *pUseCustomColor;
|
||||||
if(*pUseCustomColor)
|
if(*pUseCustomColor)
|
||||||
{
|
{
|
||||||
|
|
|
@ -844,7 +844,10 @@ void CPlayers::OnRender()
|
||||||
{
|
{
|
||||||
aRenderInfo[i].m_aSixup[g_Config.m_ClDummy].Reset();
|
aRenderInfo[i].m_aSixup[g_Config.m_ClDummy].Reset();
|
||||||
|
|
||||||
aRenderInfo[i].Apply(pSkin);
|
aRenderInfo[i].m_OriginalRenderSkin = pSkin->m_OriginalSkin;
|
||||||
|
aRenderInfo[i].m_ColorableRenderSkin = pSkin->m_ColorableSkin;
|
||||||
|
aRenderInfo[i].m_BloodColor = pSkin->m_BloodColor;
|
||||||
|
aRenderInfo[i].m_SkinMetrics = pSkin->m_Metrics;
|
||||||
aRenderInfo[i].m_CustomColoredSkin = IsTeamplay;
|
aRenderInfo[i].m_CustomColoredSkin = IsTeamplay;
|
||||||
if(!IsTeamplay)
|
if(!IsTeamplay)
|
||||||
{
|
{
|
||||||
|
@ -854,8 +857,12 @@ void CPlayers::OnRender()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
const CSkin *pSkin = m_pClient->m_Skins.Find("x_spec");
|
||||||
CTeeRenderInfo RenderInfoSpec;
|
CTeeRenderInfo RenderInfoSpec;
|
||||||
RenderInfoSpec.Apply(m_pClient->m_Skins.Find("x_spec"));
|
RenderInfoSpec.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
|
||||||
|
RenderInfoSpec.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
|
||||||
|
RenderInfoSpec.m_BloodColor = pSkin->m_BloodColor;
|
||||||
|
RenderInfoSpec.m_SkinMetrics = pSkin->m_Metrics;
|
||||||
RenderInfoSpec.m_CustomColoredSkin = false;
|
RenderInfoSpec.m_CustomColoredSkin = false;
|
||||||
RenderInfoSpec.m_Size = 64.0f;
|
RenderInfoSpec.m_Size = 64.0f;
|
||||||
const int LocalClientId = m_pClient->m_Snap.m_LocalClientId;
|
const int LocalClientId = m_pClient->m_Snap.m_LocalClientId;
|
||||||
|
|
|
@ -102,7 +102,7 @@ void CStatboard::OnMessage(int MsgType, void *pRawMsg)
|
||||||
|
|
||||||
if(t <= p)
|
if(t <= p)
|
||||||
return;
|
return;
|
||||||
str_truncate(aName, sizeof(aName), p, t - p);
|
str_utf8_truncate(aName, sizeof(aName), p, t - p);
|
||||||
|
|
||||||
for(int i = 0; i < MAX_CLIENTS; i++)
|
for(int i = 0; i < MAX_CLIENTS; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1554,7 +1554,11 @@ void CGameClient::OnNewSnapshot()
|
||||||
pClient->m_SkinInfo.m_Size = 64;
|
pClient->m_SkinInfo.m_Size = 64;
|
||||||
|
|
||||||
// find new skin
|
// find new skin
|
||||||
pClient->m_SkinInfo.Apply(m_Skins.Find(pClient->m_aSkinName));
|
const CSkin *pSkin = m_Skins.Find(pClient->m_aSkinName);
|
||||||
|
pClient->m_SkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
|
||||||
|
pClient->m_SkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
|
||||||
|
pClient->m_SkinInfo.m_SkinMetrics = pSkin->m_Metrics;
|
||||||
|
pClient->m_SkinInfo.m_BloodColor = pSkin->m_BloodColor;
|
||||||
pClient->m_SkinInfo.m_CustomColoredSkin = pClient->m_UseCustomColor;
|
pClient->m_SkinInfo.m_CustomColoredSkin = pClient->m_UseCustomColor;
|
||||||
|
|
||||||
if(!pClient->m_UseCustomColor)
|
if(!pClient->m_UseCustomColor)
|
||||||
|
@ -3746,9 +3750,13 @@ void CGameClient::RefreshSkins()
|
||||||
|
|
||||||
for(auto &Client : m_aClients)
|
for(auto &Client : m_aClients)
|
||||||
{
|
{
|
||||||
|
Client.m_SkinInfo.m_OriginalRenderSkin.Reset();
|
||||||
|
Client.m_SkinInfo.m_ColorableRenderSkin.Reset();
|
||||||
if(Client.m_aSkinName[0] != '\0')
|
if(Client.m_aSkinName[0] != '\0')
|
||||||
{
|
{
|
||||||
Client.m_SkinInfo.Apply(m_Skins.Find(Client.m_aSkinName));
|
const CSkin *pSkin = m_Skins.Find(Client.m_aSkinName);
|
||||||
|
Client.m_SkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
|
||||||
|
Client.m_SkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -56,14 +56,6 @@ public:
|
||||||
Sixup.Reset();
|
Sixup.Reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Apply(const CSkin *pSkin)
|
|
||||||
{
|
|
||||||
m_OriginalRenderSkin = pSkin->m_OriginalSkin;
|
|
||||||
m_ColorableRenderSkin = pSkin->m_ColorableSkin;
|
|
||||||
m_BloodColor = pSkin->m_BloodColor;
|
|
||||||
m_SkinMetrics = pSkin->m_Metrics;
|
|
||||||
}
|
|
||||||
|
|
||||||
CSkin::SSkinTextures m_OriginalRenderSkin;
|
CSkin::SSkinTextures m_OriginalRenderSkin;
|
||||||
CSkin::SSkinTextures m_ColorableRenderSkin;
|
CSkin::SSkinTextures m_ColorableRenderSkin;
|
||||||
|
|
||||||
|
|
|
@ -1300,8 +1300,6 @@ float CUi::DoScrollbarV(const void *pId, const CUIRect *pRect, float Current)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(HotItem() == pId)
|
else if(HotItem() == pId)
|
||||||
{
|
|
||||||
if(InsideHandle)
|
|
||||||
{
|
{
|
||||||
if(MouseButton(0))
|
if(MouseButton(0))
|
||||||
{
|
{
|
||||||
|
@ -1310,15 +1308,14 @@ float CUi::DoScrollbarV(const void *pId, const CUIRect *pRect, float Current)
|
||||||
Grabbed = true;
|
Grabbed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(MouseButtonClicked(0))
|
else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
|
||||||
{
|
{
|
||||||
SetActiveItem(pId);
|
SetActiveItem(pId);
|
||||||
m_ActiveScrollbarOffset = Handle.h / 2.0f;
|
m_ActiveScrollbarOffset = Handle.h / 2.0f;
|
||||||
Grabbed = true;
|
Grabbed = true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if(InsideRail && !MouseButton(0))
|
if(InsideHandle && !MouseButton(0))
|
||||||
{
|
{
|
||||||
SetHotItem(pId);
|
SetHotItem(pId);
|
||||||
}
|
}
|
||||||
|
@ -1382,8 +1379,6 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(HotItem() == pId)
|
else if(HotItem() == pId)
|
||||||
{
|
|
||||||
if(InsideHandle)
|
|
||||||
{
|
{
|
||||||
if(MouseButton(0))
|
if(MouseButton(0))
|
||||||
{
|
{
|
||||||
|
@ -1392,13 +1387,12 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
|
||||||
Grabbed = true;
|
Grabbed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(MouseButtonClicked(0))
|
else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
|
||||||
{
|
{
|
||||||
SetActiveItem(pId);
|
SetActiveItem(pId);
|
||||||
m_ActiveScrollbarOffset = Handle.w / 2.0f;
|
m_ActiveScrollbarOffset = Handle.w / 2.0f;
|
||||||
Grabbed = true;
|
Grabbed = true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if(!pColorInner && (InsideHandle || Grabbed) && (CheckActiveItem(pId) || HotItem() == pId))
|
if(!pColorInner && (InsideHandle || Grabbed) && (CheckActiveItem(pId) || HotItem() == pId))
|
||||||
{
|
{
|
||||||
|
@ -1406,7 +1400,7 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
|
||||||
Handle.y -= 1.5f;
|
Handle.y -= 1.5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(InsideRail && !MouseButton(0))
|
if(InsideHandle && !MouseButton(0))
|
||||||
{
|
{
|
||||||
SetHotItem(pId);
|
SetHotItem(pId);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue