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

heinrich styling

Browse source
This commit is contained in:
fokkonaut 2018-07-25 23:36:52 +02:00
parent e621a4a8a2
commit 32b6bd44f6
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/client/components/skins.cpp
View file

@ -60,9 +60,8 @@ int CSkins::SkinScan(const char *pName, int IsDir, int DirType, void *pUser)
}
CSkin Skin;
Skin.m_OrgTexture = pSelf->Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, Info.m_Format, 0);
Skin.m_IsVanilla = IsVanillaSkin(aFilenameWithoutPng);
Skin.m_OrgTexture = pSelf->Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, Info.m_Format, 0);
int BodySize = 96; // body size
if (BodySize > Info.m_Height)
@ -209,7 +208,7 @@ int CSkins::FindImpl(const char *pName) const
{
if(str_comp(m_aSkins[i].m_aName, pName) == 0)
{
if(g_Config.m_ClVanillaSkinsOnly && !IsVanillaSkin(m_aSkins[i].m_aName))
if(g_Config.m_ClVanillaSkinsOnly && !m_aSkins[i].m_IsVanilla)
{
return -1;
}

2
src/game/client/components/skins.h
View file

@ -12,11 +12,11 @@ public:
// do this better and nicer
struct CSkin
{
bool m_IsVanilla;
int m_OrgTexture;
int m_ColorTexture;
char m_aName[24];
vec3 m_BloodColor;
bool m_IsVanilla;
bool operator<(const CSkin &Other) { return str_comp(m_aName, Other.m_aName) < 0; }
};