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

Merge pull request #8480 from TylerStocks1/master

Browse source 
Readd is not a word, Reload makes more sense and is easier readablility.
This commit is contained in:
Jupeyy 2024-06-14 12:44:04 +00:00 committed by GitHub
parent ec42dea161 249c8572ae
commit f061dfdc84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/editor/popups.cpp
View file

@ -1632,7 +1632,7 @@ CUi::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View,
CEditor *pEditor = static_cast<CEditor *>(pContext);
static int s_ExternalButton = 0;
static int s_ReaddButton = 0;
static int s_ReimportButton = 0;
static int s_ReplaceButton = 0;
static int s_RemoveButton = 0;
static int s_ExportButton = 0;
@ -1686,7 +1686,7 @@ CUi::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View,
static CUi::SSelectionPopupContext s_SelectionPopupContext;
static CScrollRegion s_SelectionPopupScrollRegion;
s_SelectionPopupContext.m_pScrollRegion = &s_SelectionPopupScrollRegion;
if(pEditor->DoButton_MenuItem(&s_ReaddButton, "Readd", 0, &Slot, 0, "Reloads the image from the mapres folder"))
if(pEditor->DoButton_MenuItem(&s_ReimportButton, "Re-import", 0, &Slot, 0, "Re-imports the image from the mapres folder"))
{
char aFilename[IO_MAX_PATH_LENGTH];
str_format(aFilename, sizeof(aFilename), "%s.png", pImg->m_aName);
@ -1754,7 +1754,7 @@ CUi::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View,
{
CEditor *pEditor = static_cast<CEditor *>(pContext);
static int s_ReaddButton = 0;
static int s_ReimportButton = 0;
static int s_ReplaceButton = 0;
static int s_RemoveButton = 0;
static int s_ExportButton = 0;
@ -1785,7 +1785,7 @@ CUi::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View,
View.HSplitTop(5.0f, nullptr, &View);
View.HSplitTop(RowHeight, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_ReaddButton, "Readd", 0, &Slot, 0, "Reloads the sound from the mapres folder"))
if(pEditor->DoButton_MenuItem(&s_ReimportButton, "Re-import", 0, &Slot, 0, "Re-imports the sound from the mapres folder"))
{
char aFilename[IO_MAX_PATH_LENGTH];
str_format(aFilename, sizeof(aFilename), "%s.opus", pSound->m_aName);