dkforest

commit 5c8ac2be8f543d5e028c454ce6a36206b2d7b93e
parent 1130f47b5e9e7e41fc015276bdb4d781de74fb89
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 17 Dec 2023 06:16:17 -0500

cleanup

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

1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -296,24 +296,25 @@ func (g *Ongoing) GetDeckHash() string {
 }
 
 func (g *Ongoing) GetPlayerBySeatIdx(seatIdx int) *PokerPlayer {
-	for _, p := range g.Players {
-		if p.SeatIdx == seatIdx {
-			return p
-		}
-	}
-	return nil
+	p, _ := g.getPlayerBySeatIdx(seatIdx)
+	return p
 }
 
 // Get the player index in Ongoing.Players from a seat index (index in PokerGame.Players)
 // [nil p1 nil nil p2 nil] -> PokerGame.Players
 // [p1 p2]                 -> Ongoing.Players
-func (g *Ongoing) getPlayerIdxBySeatIdx(seatIdx int) (idx int) {
-	for i, p := range g.Players {
+func (g *Ongoing) getPlayerIdxBySeatIdx(seatIdx int) int {
+	_, idx := g.getPlayerBySeatIdx(seatIdx)
+	return idx
+}
+
+func (g *Ongoing) getPlayerBySeatIdx(seatIdx int) (*PokerPlayer, int) {
+	for idx, p := range g.Players {
 		if p.SeatIdx == seatIdx {
-			return i
+			return p, idx
 		}
 	}
-	return -1
+	return nil, -1
 }
 
 func (g *Ongoing) CountCanVotePlayers() (nbCanVote int) {