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

Clean up skin downloader code a bit

Browse source 
Was trying to find what's causing the issues with skin downloader, but
didn't find anything suspicious.
This commit is contained in:
def 2020-09-18 23:06:35 +02:00
parent 591dfb0d02
commit 61f89533c5
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -249,7 +249,7 @@ int CSkins::FindImpl(const char *pName)
LoadSkin(d.front().m_aName, aPath, IStorage::TYPE_SAVE);
d.front().m_pTask = nullptr;
}
if(d.front().m_pTask && d.front().m_pTask->State() == HTTP_ERROR)
if(d.front().m_pTask && (d.front().m_pTask->State() == HTTP_ERROR || d.front().m_pTask->State() == HTTP_ABORTED))
{
Storage()->RemoveFile(d.front().m_aPath, IStorage::TYPE_SAVE);
d.front().m_pTask = nullptr;
@ -257,18 +257,8 @@ int CSkins::FindImpl(const char *pName)
return -1;
}
int DefaultIndex = CSkins::FindImpl("default");
// if default fails don't start any download
if(DefaultIndex == -1)
return -1;
CDownloadSkin Skin;
str_copy(Skin.m_aName, pName, sizeof(Skin.m_aName));
Skin.m_IsVanilla = false;
Skin.m_OrgTexture = m_aSkins[DefaultIndex].m_OrgTexture;
Skin.m_ColorTexture = m_aSkins[DefaultIndex].m_ColorTexture;
Skin.m_BloodColor = m_aSkins[DefaultIndex].m_BloodColor;
char aUrl[256];
str_format(aUrl, sizeof(aUrl), "%s%s.png", g_Config.m_ClSkinDownloadUrl, pName);

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

@ -26,10 +26,15 @@ public:
bool operator==(const char *pOther) { return !str_comp(m_aName, pOther); }
};
struct CDownloadSkin : public CSkin
struct CDownloadSkin
{
std::shared_ptr<CGetFile> m_pTask;
char m_aPath[MAX_PATH_LENGTH];
char m_aName[24];
bool operator<(const CDownloadSkin &Other) { return str_comp(m_aName, Other.m_aName) < 0; }
bool operator<(const char *pOther) { return str_comp(m_aName, pOther) < 0; }
bool operator==(const char *pOther) { return !str_comp(m_aName, pOther); }
};
void OnInit();