From b25bbe31f4152463c1ec287442bcbb7568650ab3 Mon Sep 17 00:00:00 2001 From: "M. Sz" Date: Tue, 19 Jan 2021 17:47:42 +0100 Subject: [PATCH] d2ui: rename NewCustomButton -> NewDefaultButton; lintfix --- d2common/d2enum/players_relationships.go | 2 ++ d2core/d2ui/button.go | 4 ++-- d2game/d2player/party_panel.go | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/d2common/d2enum/players_relationships.go b/d2common/d2enum/players_relationships.go index 70efeafa..bd05b437 100644 --- a/d2common/d2enum/players_relationships.go +++ b/d2common/d2enum/players_relationships.go @@ -10,10 +10,12 @@ const ( PlayerRelationEnemy ) +// determinates a level, which both players should reach to go hostile const ( PlayersHostileLevel = 9 ) +// determinates max players number for one game const ( MaxPlayersInGame = 8 ) diff --git a/d2core/d2ui/button.go b/d2core/d2ui/button.go index d576fd8f..a3844c46 100644 --- a/d2core/d2ui/button.go +++ b/d2core/d2ui/button.go @@ -811,8 +811,8 @@ func (ui *UIManager) NewButton(buttonType ButtonType, text string) *Button { return btn } -// NewCustomButton creates new custom button -func (ui *UIManager) NewCustomButton(path string, frame int) *Button { +// NewDefaultButton creates a new button with default settings +func (ui *UIManager) NewDefaultButton(path string, frame int) *Button { layout := &ButtonLayout{ XSegments: 1, YSegments: 1, diff --git a/d2game/d2player/party_panel.go b/d2game/d2player/party_panel.go index 87da24d4..1c976e0f 100644 --- a/d2game/d2player/party_panel.go +++ b/d2game/d2player/party_panel.go @@ -371,8 +371,8 @@ func (s *PartyPanel) Load() { // createSwitcher creates party-panel switcher using frame given func (s *PartyPanel) createSwitcher(frame int) *d2ui.SwitchableButton { - active := s.uiManager.NewCustomButton(d2resource.PartyBoxes, frame) - inactive := s.uiManager.NewCustomButton(d2resource.PartyBoxes, frame+d2enum.PartyButtonNextButtonFrame) + active := s.uiManager.NewDefaultButton(d2resource.PartyBoxes, frame) + inactive := s.uiManager.NewDefaultButton(d2resource.PartyBoxes, frame+d2enum.PartyButtonNextButtonFrame) switcher := s.uiManager.NewSwitchableButton(active, inactive, true) switcher.SetVisible(false)