Fix rematch button not appearing

This commit is contained in:
Trevor Slocum 2024-11-20 09:44:25 -08:00
parent f6dd091353
commit 4e25c3209d
3 changed files with 13 additions and 12 deletions

View file

@ -1933,6 +1933,10 @@ func (g *Game) handleEvent(e interface{}) {
incomingGameLogMove = false
}
if !g.board.gameState.Spectating && (g.board.gameState.Player1.Points >= g.board.gameState.Points || g.board.gameState.Player2.Points >= g.board.gameState.Points) {
g.board.rematchButton.SetVisible(true)
}
setViewBoard(true)
case *bgammon.EventRolled:
playSound := SoundEffect(-1)
@ -2045,9 +2049,6 @@ func (g *Game) handleEvent(e interface{}) {
message += fmt.Sprintf(" (+%d)", ev.Rating)
}
lg(message)
if (g.board.gameState.Player1.Points >= g.board.gameState.Points || g.board.gameState.Player2.Points >= g.board.gameState.Points) && !g.board.gameState.Spectating {
g.board.rematchButton.SetVisible(true)
}
g.board.Unlock()
case *bgammon.EventSettings:
g.board.stateLock.Lock()

6
go.mod
View file

@ -5,13 +5,13 @@ go 1.23
toolchain go1.23.0
require (
code.rocket9labs.com/tslocum/bgammon v0.0.0-20241119003936-1ea81e724209
code.rocket9labs.com/tslocum/bgammon v0.0.0-20241119105320-bdceb0644748
code.rocket9labs.com/tslocum/bgammon-bei-bot v0.0.0-20240917031657-2648772e515e
code.rocket9labs.com/tslocum/etk v0.0.0-20241119084953-59a6f9c83cc3
code.rocket9labs.com/tslocum/etk v0.0.0-20241119085405-e8f49c56416a
code.rocket9labs.com/tslocum/gotext v0.0.0-20240728181248-46f419ff143b
code.rocket9labs.com/tslocum/tabula v0.0.0-20241024013344-d112a9463c51
github.com/coder/websocket v1.8.12
github.com/hajimehoshi/ebiten/v2 v2.8.4
github.com/hajimehoshi/ebiten/v2 v2.8.5
github.com/llgcode/draw2d v0.0.0-20240627062922-0ed1ff131195
golang.org/x/sys v0.27.0
golang.org/x/text v0.20.0

12
go.sum
View file

@ -1,13 +1,13 @@
code.rocket9labs.com/tslocum/bei v0.0.0-20240108012722-6db380cc190b h1:Y0a14Kf/hSYepSmp4ZfDeE4CZZGBGBS97CNjCbKJm0c=
code.rocket9labs.com/tslocum/bei v0.0.0-20240108012722-6db380cc190b/go.mod h1:tS60/VNAJphKvDBkSLQhKALa15msIAuWWfEKNc4oFZc=
code.rocket9labs.com/tslocum/bgammon v0.0.0-20241119003936-1ea81e724209 h1:ZARw0AnH9G41/p2jhGc2ItijM3Oe8ZLhQhPU/otYKmE=
code.rocket9labs.com/tslocum/bgammon v0.0.0-20241119003936-1ea81e724209/go.mod h1:FzdCJoZoG/6nkxLl6OufdfFTXggr5ZArtl7eJ/CCcj0=
code.rocket9labs.com/tslocum/bgammon v0.0.0-20241119105320-bdceb0644748 h1:kwZKXndstkryQOnltaZNR1JDZvpoF31IhuC+clsN1k4=
code.rocket9labs.com/tslocum/bgammon v0.0.0-20241119105320-bdceb0644748/go.mod h1:FzdCJoZoG/6nkxLl6OufdfFTXggr5ZArtl7eJ/CCcj0=
code.rocket9labs.com/tslocum/bgammon-bei-bot v0.0.0-20240917031657-2648772e515e h1:5DSsHaB/xrD57Gmu/1YaWMRFLiTVvVmcZRa9/EJZuZo=
code.rocket9labs.com/tslocum/bgammon-bei-bot v0.0.0-20240917031657-2648772e515e/go.mod h1:mZA8T+w1qkH5tzFfDQb87wCms+qlulyT9Q8deuK1ApQ=
code.rocket9labs.com/tslocum/clipboard v0.0.0-20241012025701-2c0fb515daab h1:0sF/YYnb3/GaPMKALyNVXS0Ku5JoulpC4GWdTcP1v+Q=
code.rocket9labs.com/tslocum/clipboard v0.0.0-20241012025701-2c0fb515daab/go.mod h1:v2cql+mNoahFvZ1U/KQmDDqPmD0H0l1jyistVAgg8YA=
code.rocket9labs.com/tslocum/etk v0.0.0-20241119084953-59a6f9c83cc3 h1:VwCkzZ41Ssu5XVCMYUHgVsWVUzDU7r3RM7dV+1hvqiY=
code.rocket9labs.com/tslocum/etk v0.0.0-20241119084953-59a6f9c83cc3/go.mod h1:Vx+vyYrAVVbPrrHUg570gfdFSdDOqQIZzREf/FNVKt8=
code.rocket9labs.com/tslocum/etk v0.0.0-20241119085405-e8f49c56416a h1:y4i0iAPzSe+/XIHYt6JV8rwd6lyS+QFPNb+cmzFN9Sc=
code.rocket9labs.com/tslocum/etk v0.0.0-20241119085405-e8f49c56416a/go.mod h1:Vx+vyYrAVVbPrrHUg570gfdFSdDOqQIZzREf/FNVKt8=
code.rocket9labs.com/tslocum/gotext v0.0.0-20240728181248-46f419ff143b h1:KSdR7VPoftY5Bt+osGRBbtHlCWxhe1QbOuf58CG7ieI=
code.rocket9labs.com/tslocum/gotext v0.0.0-20240728181248-46f419ff143b/go.mod h1:ZkYZ/IF/ebzhUL2bNp4ALROsuH9iCztUWvUJBWsHXRU=
code.rocket9labs.com/tslocum/tabula v0.0.0-20241024013344-d112a9463c51 h1:JkjRKoSSmtHFSVIOAZV6e+Z+7r0mIxClsDpJxC/ZlOs=
@ -62,8 +62,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/hajimehoshi/bitmapfont/v3 v3.2.0 h1:0DISQM/rseKIJhdF29AkhvdzIULqNIIlXAGWit4ez1Q=
github.com/hajimehoshi/bitmapfont/v3 v3.2.0/go.mod h1:8gLqGatKVu0pwcNCJguW3Igg9WQqVXF0zg/RvrGQWyg=
github.com/hajimehoshi/ebiten/v2 v2.8.4 h1:BzXkcyYX046SRZFkzF2KaCaHiBjwCaufUPCAOK59JSw=
github.com/hajimehoshi/ebiten/v2 v2.8.4/go.mod h1:SXx/whkvpfsavGo6lvZykprerakl+8Uo1X8d2U5aAnA=
github.com/hajimehoshi/ebiten/v2 v2.8.5 h1:w1/3XxjEwIo+amtQCOnCrwGzu4e6dr0ewu83JUKoxrM=
github.com/hajimehoshi/ebiten/v2 v2.8.5/go.mod h1:SXx/whkvpfsavGo6lvZykprerakl+8Uo1X8d2U5aAnA=
github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=