mirror of
https://github.com/OpenDiablo2/OpenDiablo2
synced 2024-06-10 09:50:42 +00:00
fixed build and lint errors
This commit is contained in:
parent
8700d63f67
commit
3a5175f034
|
@ -274,7 +274,7 @@ func NewGameControls(
|
||||||
hoverLabel.SetBackgroundColor(d2util.Color(blackAlpha50percent))
|
hoverLabel.SetBackgroundColor(d2util.Color(blackAlpha50percent))
|
||||||
|
|
||||||
gc.heroStatsPanel.SetOnCloseCb(gc.onCloseHeroStatsPanel)
|
gc.heroStatsPanel.SetOnCloseCb(gc.onCloseHeroStatsPanel)
|
||||||
gc.questLog.SetOnCloseCb(gc.onCloseHeroQuestLog)
|
gc.questLog.SetOnCloseCb(gc.onCloseQuestLog)
|
||||||
gc.inventory.SetOnCloseCb(gc.onCloseInventory)
|
gc.inventory.SetOnCloseCb(gc.onCloseInventory)
|
||||||
gc.skilltree.SetOnCloseCb(gc.onCloseSkilltree)
|
gc.skilltree.SetOnCloseCb(gc.onCloseSkilltree)
|
||||||
|
|
||||||
|
@ -604,10 +604,6 @@ func (g *GameControls) clearRightScreenSide() {
|
||||||
g.updateLayout()
|
g.updateLayout()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GameControls) hasOpenPanels() bool {
|
|
||||||
return g.isRightPanelOpen() || g.isLeftPanelOpen() || g.hud.skillSelectMenu.IsOpen()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (g *GameControls) clearScreen() {
|
func (g *GameControls) clearScreen() {
|
||||||
g.clearRightScreenSide()
|
g.clearRightScreenSide()
|
||||||
g.clearLeftScreenSide()
|
g.clearLeftScreenSide()
|
||||||
|
@ -618,8 +614,9 @@ func (g *GameControls) clearScreen() {
|
||||||
func (g *GameControls) openLeftPanel(panel Panel) {
|
func (g *GameControls) openLeftPanel(panel Panel) {
|
||||||
if !g.HelpOverlay.IsOpen() {
|
if !g.HelpOverlay.IsOpen() {
|
||||||
isOpen := panel.IsOpen()
|
isOpen := panel.IsOpen()
|
||||||
fmt.Println(isOpen)
|
|
||||||
g.clearLeftScreenSide()
|
g.clearLeftScreenSide()
|
||||||
|
|
||||||
if !isOpen {
|
if !isOpen {
|
||||||
panel.Open()
|
panel.Open()
|
||||||
g.hud.miniPanel.SetMovedRight(true)
|
g.hud.miniPanel.SetMovedRight(true)
|
||||||
|
@ -631,8 +628,9 @@ func (g *GameControls) openLeftPanel(panel Panel) {
|
||||||
func (g *GameControls) openRightPanel(panel Panel) {
|
func (g *GameControls) openRightPanel(panel Panel) {
|
||||||
if !g.HelpOverlay.IsOpen() {
|
if !g.HelpOverlay.IsOpen() {
|
||||||
isOpen := panel.IsOpen()
|
isOpen := panel.IsOpen()
|
||||||
fmt.Println(isOpen)
|
|
||||||
g.clearRightScreenSide()
|
g.clearRightScreenSide()
|
||||||
|
|
||||||
if !isOpen {
|
if !isOpen {
|
||||||
panel.Open()
|
panel.Open()
|
||||||
g.hud.miniPanel.SetMovedLeft(true)
|
g.hud.miniPanel.SetMovedLeft(true)
|
||||||
|
@ -666,6 +664,9 @@ func (g *GameControls) toggleQuestLog() {
|
||||||
g.openLeftPanel(g.questLog)
|
g.openLeftPanel(g.questLog)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (g *GameControls) onCloseQuestLog() {
|
||||||
|
}
|
||||||
|
|
||||||
func (g *GameControls) toggleHelpOverlay() {
|
func (g *GameControls) toggleHelpOverlay() {
|
||||||
if !g.isRightPanelOpen() || g.isLeftPanelOpen() {
|
if !g.isRightPanelOpen() || g.isLeftPanelOpen() {
|
||||||
g.HelpOverlay.updateKeyMap(g.keyMap)
|
g.HelpOverlay.updateKeyMap(g.keyMap)
|
||||||
|
@ -759,6 +760,10 @@ func (g *GameControls) isRightPanelOpen() bool {
|
||||||
return g.inventory.IsOpen() || g.skilltree.IsOpen()
|
return g.inventory.IsOpen() || g.skilltree.IsOpen()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (g *GameControls) hasOpenPanels() bool {
|
||||||
|
return g.isRightPanelOpen() || g.isLeftPanelOpen() || g.hud.skillSelectMenu.IsOpen()
|
||||||
|
}
|
||||||
|
|
||||||
func (g *GameControls) isInActiveMenusRect(px, py int) bool {
|
func (g *GameControls) isInActiveMenusRect(px, py int) bool {
|
||||||
if g.bottomMenuRect.IsInRect(px, py) {
|
if g.bottomMenuRect.IsInRect(px, py) {
|
||||||
return true
|
return true
|
||||||
|
|
Loading…
Reference in New Issue
Block a user