dkforest

commit 4090c080e3a6a33eba6bed03372212f6ceeedf22
parent f84aa9fce586cc72eccbd88003b692350c74b572
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 18 Dec 2023 04:23:53 -0500

cleanup

Diffstat:
M
pkg/web/handlers/poker/poker.go
 | 
36
++++++++++++++++++------------------

1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -1303,24 +1303,24 @@ func (g *PokerGame) Deal(roomID RoomID, authUser *database.User) {
 }
 
 func (g *PokerGame) CountEligibleSeated() (count int) {
-	g.Players.RLock()
-	defer g.Players.RUnlock()
-	for _, p := range *g.Players.Val() {
-		if p.isEligible(g.PokerTableMinBet) {
-			count++
+	g.Players.RWith(func(gPlayers *[]*SeatedPlayer) {
+		for _, p := range *gPlayers {
+			if p.isEligible(g.PokerTableMinBet) {
+				count++
+			}
 		}
-	}
+	})
 	return
 }
 
 func (g *PokerGame) CountSeated() (count int) {
-	g.Players.RLock()
-	defer g.Players.RUnlock()
-	for _, p := range *g.Players.Val() {
-		if p != nil {
-			count++
+	g.Players.RWith(func(gPlayers *[]*SeatedPlayer) {
+		for _, p := range *gPlayers {
+			if p != nil {
+				count++
+			}
 		}
-	}
+	})
 	return
 }
 
@@ -1879,14 +1879,14 @@ func drawGameStartedEvent(evt GameStartedEvent, authUser *database.User) (html s
 }
 
 func drawGameIsDoneHtml(g *PokerGame, evt GameIsDoneEvent) (html string) {
-	g.Players.RLock()
-	defer g.Players.RUnlock()
 	html += `<style>`
-	for i, p := range *g.Players.Val() {
-		if p != nil {
-			html += `#seat` + itoa(i+1) + `_cash:before { content: "` + itoa2(p.GetCash()) + `"; }`
+	g.Players.RWith(func(gPlayers *[]*SeatedPlayer) {
+		for i, p := range *gPlayers {
+			if p != nil {
+				html += `#seat` + itoa(i+1) + `_cash:before { content: "` + itoa2(p.GetCash()) + `"; }`
+			}
 		}
-	}
+	})
 	html += `#winner:before { content: "Winner: ` + evt.Winner + ` (` + evt.WinnerHand + `)"; }`
 	html += "</style>"
 	return