gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-10 10:36:42 -05:00
Code Issues Releases Wiki Activity

fix(escape_menu): fix pentagrams starting position, default menu entry, and rotation direction #460 (#765)

Browse Source
This commit is contained in:
Benjamin Maisonnas 2020-10-11 00:46:13 +02:00 committed by GitHub
parent b5e052fc81
commit 7be3b7b98d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
d2game/d2player/escape_menu.go
View File

@ -3,6 +3,7 @@ package d2player
import ( import (
"fmt" "fmt"
"log" "log"
"time"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface"
@ -22,7 +23,7 @@ const (
// UI // UI
labelGutter = 10 labelGutter = 10
sidePanelsSize = 80 sidePanelsSize = 80
pentSize = 52 pentSize = 54
menuSize = 500 menuSize = 500
spacerWidth = 10 spacerWidth = 10
@ -81,6 +82,7 @@ type layout struct {
leftPent *d2gui.AnimatedSprite leftPent *d2gui.AnimatedSprite
rightPent *d2gui.AnimatedSprite rightPent *d2gui.AnimatedSprite
currentEl int currentEl int
rendered bool
actionableElements []actionableElement actionableElements []actionableElement
} }
@ -224,9 +226,9 @@ func (m *EscapeMenu) wrapLayout(fn func(*layout)) *layout {
center := wrapper.AddLayout(d2gui.PositionTypeHorizontal) center := wrapper.AddLayout(d2gui.PositionTypeHorizontal)
center.SetSize(menuSize, 0) center.SetSize(menuSize, 0)
left := center.AddLayout(d2gui.PositionTypeHorizontal) left := center.AddLayout(d2gui.PositionTypeVertical)
left.SetSize(sidePanelsSize, 0) left.SetSize(sidePanelsSize, pentSize)
leftPent, err := left.AddAnimatedSprite(d2resource.PentSpin, d2resource.PaletteUnits, d2gui.DirectionForward) leftPent, err := left.AddAnimatedSprite(d2resource.PentSpin, d2resource.PaletteUnits, d2gui.DirectionBackward)
if err != nil { if err != nil {
log.Print(err) log.Print(err)
return nil return nil
@ -244,8 +246,8 @@ func (m *EscapeMenu) wrapLayout(fn func(*layout)) *layout {
right := center.AddLayout(d2gui.PositionTypeHorizontal) right := center.AddLayout(d2gui.PositionTypeHorizontal)
// For some reason, aligning the panel to the right won't align the pentagram, so we need to add a static spacer. // For some reason, aligning the panel to the right won't align the pentagram, so we need to add a static spacer.
right.AddSpacerStatic(sidePanelsSize-pentSize, 0) right.AddSpacerStatic(sidePanelsSize-pentSize, 0)
right.SetSize(sidePanelsSize, 0) right.SetSize(sidePanelsSize, pentSize)
rightPent, err := right.AddAnimatedSprite(d2resource.PentSpin, d2resource.PaletteUnits, d2gui.DirectionBackward) rightPent, err := right.AddAnimatedSprite(d2resource.PentSpin, d2resource.PaletteUnits, d2gui.DirectionForward)
if err != nil { if err != nil {
log.Print(err) log.Print(err)
return nil return nil
@ -360,6 +362,7 @@ func (m *EscapeMenu) OnLoad() {
} }
func (m *EscapeMenu) OnEscKey() { func (m *EscapeMenu) OnEscKey() {
// note: original D2 returns straight to the game from however deep in the menu we are
switch m.currentLayout { switch m.currentLayout {
case optionsLayoutID: case optionsLayoutID:
m.setLayout(mainLayoutID) m.setLayout(mainLayoutID)
@ -424,9 +427,23 @@ func (m *EscapeMenu) setLayout(id layoutID) {
m.leftPent = m.layouts[id].leftPent m.leftPent = m.layouts[id].leftPent
m.rightPent = m.layouts[id].rightPent m.rightPent = m.layouts[id].rightPent
m.currentLayout = id m.currentLayout = id
m.layouts[id].currentEl = 0 m.layouts[id].currentEl = len(m.layouts[id].actionableElements) - 1 // default to Previous Menu
m.guiManager.SetLayout(m.layouts[id].Layout) m.guiManager.SetLayout(m.layouts[id].Layout)
m.onHoverElement(0)
// when first rendering a layout, widgets don't have offsets so we hide pentagrams for a frame
if !m.layouts[id].rendered {
m.layouts[id].rendered = true
m.leftPent.SetVisible(false)
m.rightPent.SetVisible(false)
go func() {
time.Sleep(16 * time.Millisecond)
m.onHoverElement(m.layouts[id].currentEl)
m.leftPent.SetVisible(true)
m.rightPent.SetVisible(true)
}()
} else {
m.onHoverElement(m.layouts[id].currentEl)
}
} }
func (m *EscapeMenu) onUpKey() { func (m *EscapeMenu) onUpKey() {