gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-20 23:47:16 -05:00
Code Issues Releases Wiki Activity

double click char select to load char (#755)

Browse Source 
* double click char select to load char

* removed vestigial code

* fixed out of index error
This commit is contained in:
leahiel 2020-09-25 21:53:56 -04:00 committed by GitHub
parent 4bbc2e3470
commit 9dcf7cefca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
d2game/d2gamescreen/character_select.go
View File

@ -44,6 +44,8 @@ type CharacterSelect struct {
characterImage [8]*d2mapentity.Player
gameStates []*d2hero.HeroState
selectedCharacter int
tickTimer float64
storedTickTimer float64
showDeleteConfirmation bool
connectionType d2clientconnectiontype.ClientConnectionType
connectionHost string
@ -134,6 +136,10 @@ const (
okBtnX, okBtnY = 625, 537
)
const (
doubleClickTime = 1.25
)
// OnLoad loads the resources for the Character Select screen
func (v *CharacterSelect) OnLoad(loading d2screen.LoadingState) {
var err error
@ -390,18 +396,35 @@ func (v *CharacterSelect) OnMouseButtonDown(event d2interface.MouseEvent) bool {
localMouseX := mx - selectionBoxOffsetX
localMouseY := my - selectionBoxOffsetY
// if Mouse is within character selection bounds.
if localMouseX > 0 && localMouseX < bw*2 && localMouseY >= 0 && localMouseY < bh*4 {
adjustY := localMouseY / bh
// sets current verticle index for selected character in left column.
selectedIndex := adjustY * selectionBoxNumColumns
// if selected character in left column should be in right column, add 1.
if localMouseX > bw {
selectedIndex++
}
// Make sure selection takes the scrollbar into account to make proper selection.
if (v.charScrollbar.GetCurrentOffset()*2)+selectedIndex < len(v.gameStates) {
v.selectedCharacter = (v.charScrollbar.GetCurrentOffset() * 2) + selectedIndex
selectedIndex = (v.charScrollbar.GetCurrentOffset() * 2) + selectedIndex
}
// if the selection box didn't move, check if it was a double click, otherwise set selectedCharacter to
// selectedIndex and move selection box over both.
if v.selectedCharacter == selectedIndex {
// We clicked twice within character selection box within v.doubleClickTime seconds.
if (v.tickTimer - v.storedTickTimer) < doubleClickTime {
v.onOkButtonClicked()
}
} else if selectedIndex < len(v.gameStates) {
v.selectedCharacter = selectedIndex
v.moveSelectionBox()
}
// Keep track of when we last clicked so we can determine if we double clicked a character.
v.storedTickTimer = v.tickTimer
}
return true
@ -415,6 +438,7 @@ func (v *CharacterSelect) OnMouseButtonDown(event d2interface.MouseEvent) bool {
func (v *CharacterSelect) Advance(tickTime float64) error {
for _, hero := range v.characterImage {
if hero != nil {
v.tickTimer += tickTime
hero.Advance(tickTime)
}
}