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

Merge pull request #1713 from Dune-jr/feature-theme-none

Browse source 
Scan for the none.png icon for the checkerboard theme
This commit is contained in:
oy 2018-11-24 13:58:58 +01:00 committed by GitHub
parent 30b6d760f2 91458b18f6
commit 872d1a667a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -594,6 +594,9 @@ int CMenus::ThemeScan(const char *pName, int IsDir, int DirType, void *pUser)
else else
str_copy(aThemeName, aFullName, sizeof(aThemeName)); str_copy(aThemeName, aFullName, sizeof(aThemeName));
if(str_comp(aThemeName, "none") == 0) // "none" is reserved, disallowed for maps
return 0;
// try to edit an existing theme // try to edit an existing theme
for(int i = 0; i < pSelf->m_lThemes.size(); i++) for(int i = 0; i < pSelf->m_lThemes.size(); i++)
{ {
@ -629,7 +632,7 @@ int CMenus::ThemeIconScan(const char *pName, int IsDir, int DirType, void *pUser
// save icon for an existing theme // save icon for an existing theme
for(sorted_array<CTheme>::range r = pSelf->m_lThemes.all(); !r.empty(); r.pop_front()) // bit slow but whatever for(sorted_array<CTheme>::range r = pSelf->m_lThemes.all(); !r.empty(); r.pop_front()) // bit slow but whatever
{ {
if(str_comp(r.front().m_Name, aThemeName) == 0) if(str_comp(r.front().m_Name, aThemeName) == 0 || (!r.front().m_Name[0] && str_comp(aThemeName, "none") == 0))
{ {
char aBuf[512]; char aBuf[512];
str_format(aBuf, sizeof(aBuf), "ui/themes/%s", pName); str_format(aBuf, sizeof(aBuf), "ui/themes/%s", pName);