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

Ask for confirmation before placing border tiles (fixes #2823)

Browse source
This commit is contained in:
Fireball 2020-09-20 01:24:17 +01:00
parent f92a4753c3
commit bb2be60a08
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1298,9 +1298,10 @@ void CEditor::DoToolbar(CUIRect ToolBar)
if(pT) if(pT)
{ {
TB_Bottom.VSplitLeft(60.0f, &Button, &TB_Bottom); TB_Bottom.VSplitLeft(60.0f, &Button, &TB_Bottom);
if(DoButton_Ex(&s_BorderBut, "Border", 0, &Button, 0, "Adds border tiles", CUI::CORNER_ALL)) if(DoButton_Ex(&s_BorderBut, "Border", 0, &Button, 0, "Place tiles in a 2-tile wide border at the edges of the layer", CUI::CORNER_ALL))
{ {
DoMapBorder(); m_PopupEventType = POPEVENT_PLACE_BORDER_TILES;
m_PopupEventActivated = true;
} }
TB_Bottom.VSplitLeft(5.0f, &Button, &TB_Bottom); TB_Bottom.VSplitLeft(5.0f, &Button, &TB_Bottom);
} }
@ -6401,7 +6402,7 @@ void CEditor::Init()
ms_PickerColor = ColorHSVA(1.0f, 0.0f, 0.0f); ms_PickerColor = ColorHSVA(1.0f, 0.0f, 0.0f);
} }
void CEditor::DoMapBorder() void CEditor::PlaceBorderTiles()
{ {
CLayerTiles *pT = (CLayerTiles *)GetSelectedLayerType(0, LAYERTYPE_TILES); CLayerTiles *pT = (CLayerTiles *)GetSelectedLayerType(0, LAYERTYPE_TILES);

3
src/game/editor/editor.h
View file

@ -812,6 +812,7 @@ public:
POPEVENT_PREVENTUNUSEDTILES, POPEVENT_PREVENTUNUSEDTILES,
POPEVENT_IMAGEDIV16, POPEVENT_IMAGEDIV16,
POPEVENT_IMAGE_MAX, POPEVENT_IMAGE_MAX,
POPEVENT_PLACE_BORDER_TILES
}; };
int m_PopupEventType; int m_PopupEventType;
@ -934,7 +935,7 @@ public:
float m_CommandBox; float m_CommandBox;
char m_aSettingsCommand[256]; char m_aSettingsCommand[256];
void DoMapBorder(); void PlaceBorderTiles();
int DoButton_Editor_Common(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip); int DoButton_Editor_Common(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
int DoButton_Editor(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip); int DoButton_Editor(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip);
int DoButton_Env(const void *pID, const char *pText, int Checked, const CUIRect *pRect, const char *pToolTip, ColorRGBA Color); int DoButton_Env(const void *pID, const char *pText, int Checked, const CUIRect *pRect, const char *pToolTip, ColorRGBA Color);

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

@ -1100,6 +1100,8 @@ int CEditor::PopupEvent(CEditor *pEditor, CUIRect View, void *pContext)
pEditor->UI()->DoLabel(&Label, "Image width/height", 20.0f, 0); pEditor->UI()->DoLabel(&Label, "Image width/height", 20.0f, 0);
else if(pEditor->m_PopupEventType == POPEVENT_IMAGE_MAX) else if(pEditor->m_PopupEventType == POPEVENT_IMAGE_MAX)
pEditor->UI()->DoLabel(&Label, "Max images", 20.0f, 0); pEditor->UI()->DoLabel(&Label, "Max images", 20.0f, 0);
else if(pEditor->m_PopupEventType == POPEVENT_PLACE_BORDER_TILES)
pEditor->UI()->DoLabel(&Label, "Place border tiles", 20.0f, 0);
View.HSplitBottom(10.0f, &View, 0); View.HSplitBottom(10.0f, &View, 0);
View.HSplitBottom(20.0f, &View, &ButtonBar); View.HSplitBottom(20.0f, &View, &ButtonBar);
@ -1125,6 +1127,8 @@ int CEditor::PopupEvent(CEditor *pEditor, CUIRect View, void *pContext)
pEditor->UI()->DoLabel(&Label, "The width or height of this image is not divisible by 16. This is required for images used in tile layers for Teeworlds 0.7 compatibility.", 10.0f, -1, Label.w - 10.0f); pEditor->UI()->DoLabel(&Label, "The width or height of this image is not divisible by 16. This is required for images used in tile layers for Teeworlds 0.7 compatibility.", 10.0f, -1, Label.w - 10.0f);
else if(pEditor->m_PopupEventType == POPEVENT_IMAGE_MAX) else if(pEditor->m_PopupEventType == POPEVENT_IMAGE_MAX)
pEditor->UI()->DoLabel(&Label, "The client only allows a maximum of 64 images.", 10.0f, -1, Label.w - 10.0f); pEditor->UI()->DoLabel(&Label, "The client only allows a maximum of 64 images.", 10.0f, -1, Label.w - 10.0f);
else if(pEditor->m_PopupEventType == POPEVENT_PLACE_BORDER_TILES)
pEditor->UI()->DoLabel(&Label, "This is going to overwrite any existing tiles around the edges of the layer.\nContinue?", 10.0f, -1, Label.w - 10.0f);
// button bar // button bar
ButtonBar.VSplitLeft(30.0f, 0, &ButtonBar); ButtonBar.VSplitLeft(30.0f, 0, &ButtonBar);
@ -1145,6 +1149,8 @@ int CEditor::PopupEvent(CEditor *pEditor, CUIRect View, void *pContext)
} }
else if(pEditor->m_PopupEventType == POPEVENT_SAVE) else if(pEditor->m_PopupEventType == POPEVENT_SAVE)
pEditor->CallbackSaveMap(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor); pEditor->CallbackSaveMap(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor);
else if(pEditor->m_PopupEventType == POPEVENT_PLACE_BORDER_TILES)
pEditor->PlaceBorderTiles();
pEditor->m_PopupEventWasActivated = false; pEditor->m_PopupEventWasActivated = false;
return 1; return 1;
} }