Merge pull request ddnet#7537 from furo321/allow-unused

Hide "Allow unused" button when not using "DDNet" entities.
chillerbot · Nov 24, 2023 · edee3d5 · edee3d5
2 parents 3fff2f9 + daa0609
commit edee3d5
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/game/editor/popups.cpp b/src/game/editor/popups.cpp
@@ -280,15 +280,18 @@ CUI::EPopupMenuFunctionResult CEditor::PopupMenuSettings(void *pContext, CUIRect
  Selector.VSplitMid(&No, &Yes);
 
  pEditor->UI()->DoLabel(&Label, "Allow unused", 10.0f, TEXTALIGN_ML);
- static int s_ButtonNo = 0;
- static int s_ButtonYes = 0;
- if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !pEditor->m_AllowPlaceUnusedTiles, &No, 0, "[ctrl+u] Disallow placing unused tiles"))
- {
- pEditor->m_AllowPlaceUnusedTiles = false;
- }
- if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", pEditor->m_AllowPlaceUnusedTiles, &Yes, 0, "[ctrl+u] Allow placing unused tiles"))
+ if(pEditor->m_AllowPlaceUnusedTiles != -1)
  {
- pEditor->m_AllowPlaceUnusedTiles = true;
+ static int s_ButtonNo = 0;
+ static int s_ButtonYes = 0;
+ if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !pEditor->m_AllowPlaceUnusedTiles, &No, 0, "[ctrl+u] Disallow placing unused tiles"))
+ {
+ pEditor->m_AllowPlaceUnusedTiles = false;
+ }
+ if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", pEditor->m_AllowPlaceUnusedTiles, &Yes, 0, "[ctrl+u] Allow placing unused tiles"))
+ {
+ pEditor->m_AllowPlaceUnusedTiles = true;
+ }
  }
  }