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

editor: added reload button for image and sound popups

Browse source
This commit is contained in:
“sctt” 2022-09-10 12:23:00 +02:00
parent 6f62750833
commit 39223dfd8a
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/game/editor/editor.cpp
View file

@ -3791,6 +3791,7 @@ static void ModifyIndexDeleted(int *pIndex)
int CEditor::PopupImage(CEditor *pEditor, CUIRect View, void *pContext) int CEditor::PopupImage(CEditor *pEditor, CUIRect View, void *pContext)
{ {
static int s_ReloadButton = 0;
static int s_ReplaceButton = 0; static int s_ReplaceButton = 0;
static int s_RemoveButton = 0; static int s_RemoveButton = 0;
@ -3821,6 +3822,18 @@ int CEditor::PopupImage(CEditor *pEditor, CUIRect View, void *pContext)
View.HSplitTop(12.0f, &Slot, &View); View.HSplitTop(12.0f, &Slot, &View);
} }
if(pEditor->DoButton_MenuItem(&s_ReloadButton, "Reload", 0, &Slot, 0, "Reloads the image from mapres folder"))
{
bool bIsExternal = pImg->m_External;
char aBuffer[1024];
str_format(aBuffer, sizeof(aBuffer), "mapres/%s.png", pImg->m_aName);
pEditor->ReplaceImage(aBuffer, IStorage::TYPE_ALL, pEditor);
pImg->m_External = bIsExternal;
return 1;
}
View.HSplitTop(5.0f, &Slot, &View);
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_ReplaceButton, "Replace", 0, &Slot, 0, "Replaces the image with a new one")) if(pEditor->DoButton_MenuItem(&s_ReplaceButton, "Replace", 0, &Slot, 0, "Replaces the image with a new one"))
{ {
pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Replace Image", "Replace", "mapres", "", ReplaceImage, pEditor); pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Replace Image", "Replace", "mapres", "", ReplaceImage, pEditor);
@ -3843,12 +3856,25 @@ int CEditor::PopupImage(CEditor *pEditor, CUIRect View, void *pContext)
int CEditor::PopupSound(CEditor *pEditor, CUIRect View, void *pContext) int CEditor::PopupSound(CEditor *pEditor, CUIRect View, void *pContext)
{ {
static int s_ReloadButton = 0;
static int s_ReplaceButton = 0; static int s_ReplaceButton = 0;
static int s_RemoveButton = 0; static int s_RemoveButton = 0;
CUIRect Slot; CUIRect Slot;
View.HSplitTop(2.0f, &Slot, &View); View.HSplitTop(2.0f, &Slot, &View);
View.HSplitTop(12.0f, &Slot, &View); View.HSplitTop(12.0f, &Slot, &View);
CEditorSound *pSound = pEditor->m_Map.m_vpSounds[pEditor->m_SelectedSound];
if(pEditor->DoButton_MenuItem(&s_ReloadButton, "Reload", 0, &Slot, 0, "Reloads the sound from mapres folder"))
{
char aBuffer[1024];
str_format(aBuffer, sizeof(aBuffer), "mapres/%s.opus", pSound->m_aName);
pEditor->ReplaceSound(aBuffer, IStorage::TYPE_ALL, pEditor);
return 1;
}
View.HSplitTop(5.0f, &Slot, &View);
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_ReplaceButton, "Replace", 0, &Slot, 0, "Replaces the sound with a new one")) if(pEditor->DoButton_MenuItem(&s_ReplaceButton, "Replace", 0, &Slot, 0, "Replaces the sound with a new one"))
{ {
pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_SOUND, "Replace sound", "Replace", "mapres", "", ReplaceSound, pEditor); pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_SOUND, "Replace sound", "Replace", "mapres", "", ReplaceSound, pEditor);
@ -3857,7 +3883,6 @@ int CEditor::PopupSound(CEditor *pEditor, CUIRect View, void *pContext)
View.HSplitTop(5.0f, &Slot, &View); View.HSplitTop(5.0f, &Slot, &View);
View.HSplitTop(12.0f, &Slot, &View); View.HSplitTop(12.0f, &Slot, &View);
CEditorSound *pSound = pEditor->m_Map.m_vpSounds[pEditor->m_SelectedSound];
if(pEditor->DoButton_MenuItem(&s_RemoveButton, "Remove", 0, &Slot, 0, "Removes the sound from the map")) if(pEditor->DoButton_MenuItem(&s_RemoveButton, "Remove", 0, &Slot, 0, "Removes the sound from the map"))
{ {
delete pSound; delete pSound;
@ -4045,9 +4070,9 @@ void CEditor::RenderImagesList(CUIRect ToolBox)
CEditorImage *pImg = m_Map.m_vpImages[m_SelectedImage]; CEditorImage *pImg = m_Map.m_vpImages[m_SelectedImage];
int Height; int Height;
if(pImg->m_External || IsVanillaImage(pImg->m_aName)) if(pImg->m_External || IsVanillaImage(pImg->m_aName))
Height = 60; Height = 73;
else else
Height = 43; Height = 60;
UiInvokePopupMenu(&s_PopupImageID, 0, UI()->MouseX(), UI()->MouseY(), 120, Height, PopupImage); UiInvokePopupMenu(&s_PopupImageID, 0, UI()->MouseX(), UI()->MouseY(), 120, Height, PopupImage);
} }
} }