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

Merge pull request #8755 from ChillerDragon/pr_delete_07_skins

Browse source 
Implement 0.7 delete skin button
This commit is contained in:
Dennis Felsing 2024-08-18 06:44:10 +00:00 committed by GitHub
parent 1758bfc7f9 8d7c99fb96
commit f569981eb5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/client/components/menus.h
View file

@ -251,6 +251,7 @@ protected:
int m_TeePartSelected = protocol7::SKINPART_BODY;
const CSkins7::CSkin *m_pSelectedSkin = nullptr;
CLineInputBuffered<protocol7::MAX_SKIN_ARRAY_SIZE, protocol7::MAX_SKIN_LENGTH> m_SkinNameInput;
void PopupConfirmDeleteSkin7();
// for map download popup
int64_t m_DownloadLastCheckTime;

18
src/game/client/components/menus_settings7.cpp
View file

@ -249,9 +249,9 @@ void CMenus::RenderSettingsTee7(CUIRect MainView)
static CButtonContainer s_CustomSkinDeleteButton;
if(DoButton_Menu(&s_CustomSkinDeleteButton, Localize("Delete"), 0, &ButtonMiddle))
{
// char aBuf[128];
// str_format(aBuf, sizeof(aBuf), Localize("Are you sure that you want to delete the skin '%s'?"), m_pSelectedSkin->m_aName);
// PopupConfirm(Localize("Delete skin"), aBuf, Localize("Yes"), Localize("No"), &CMenus::PopupConfirmDeleteSkin);
char aBuf[128];
str_format(aBuf, sizeof(aBuf), Localize("Are you sure that you want to delete the skin '%s'?"), m_pSelectedSkin->m_aName);
PopupConfirm(Localize("Delete skin"), aBuf, Localize("Yes"), Localize("No"), &CMenus::PopupConfirmDeleteSkin7);
}
}
@ -292,6 +292,18 @@ void CMenus::RenderSettingsTee7(CUIRect MainView)
}
}
void CMenus::PopupConfirmDeleteSkin7()
{
dbg_assert(m_pSelectedSkin, "no skin selected for deletion");
if(!m_pClient->m_Skins7.RemoveSkin(m_pSelectedSkin))
{
PopupMessage(Localize("Error"), Localize("Unable to delete the skin"), Localize("Ok"));
return;
}
m_pSelectedSkin = nullptr;
}
void CMenus::RenderSettingsTeeBasic7(CUIRect MainView)
{
RenderSkinSelection7(MainView); // yes thats all here ^^

10
src/game/client/components/skins7.cpp
View file

@ -395,10 +395,18 @@ void CSkins7::AddSkin(const char *pSkinName, int Dummy)
m_vSkins.emplace_back(Skin);
}
void CSkins7::RemoveSkin(const CSkin *pSkin)
bool CSkins7::RemoveSkin(const CSkin *pSkin)
{
char aBuf[IO_MAX_PATH_LENGTH];
str_format(aBuf, sizeof(aBuf), SKINS_DIR "/%s.json", pSkin->m_aName);
if(!Storage()->RemoveFile(aBuf, IStorage::TYPE_SAVE))
{
return false;
}
auto Position = std::find(m_vSkins.begin(), m_vSkins.end(), *pSkin);
m_vSkins.erase(Position);
return true;
}
int CSkins7::Num()

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

@ -64,7 +64,7 @@ public:
void OnInit() override;
void AddSkin(const char *pSkinName, int Dummy);
void RemoveSkin(const CSkin *pSkin);
bool RemoveSkin(const CSkin *pSkin);
int Num();
int NumSkinPart(int Part);