dkforest

commit 5554dd1a7378f38b1cfbc1d090ecad56e194b4be
parent e5b37834d9eae8a4ef8683bf9442ce3acf11f51d
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue,  5 Dec 2023 21:30:17 -0500

cleanup

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

1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -23,6 +23,7 @@ const BurnStackX = 400
 const BurnStackY = 30
 const DealerStackX = 250
 const DealerStackY = 30
+const NbCardsPerPlayer = 2
 
 type Poker struct {
 	sync.Mutex
@@ -353,7 +354,7 @@ func dealerThread(g *PokerGame, roomID string) {
 	PokerPubSub.Pub(roomTopic, GameStartedEvent{DeckHash: deckHash})
 
 	// Deal cards
-	for j := 1; j <= 2; j++ {
+	for cardIdx := 1; cardIdx <= NbCardsPerPlayer; cardIdx++ {
 		for i, p := range g.Ongoing.Players {
 			if p == nil {
 				continue
@@ -361,28 +362,31 @@ func dealerThread(g *PokerGame, roomID string) {
 			if p.Cash == 0 {
 				continue
 			}
-			d := seats[i]
+			seatData := seats[i]
 			time.Sleep(time.Second)
 			card = g.Ongoing.Deck[idx]
 			idx++
 			name := ""
-			left := d.Left
-			top := d.Top
-			if j == 2 {
-				left = d.Left2
-				top = d.Top2
+			left := seatData.Left
+			top := seatData.Top
+			if cardIdx == 2 {
+				left = seatData.Left2
+				top = seatData.Top2
 			}
+
 			evt := PokerEvent{
 				ID:    "card" + itoa(idx),
 				Name:  name,
 				Idx:   idx,
 				Top:   top,
 				Left:  left,
-				Angle: d.Angle,
+				Angle: seatData.Angle,
 			}
-			g.Ongoing.Players[i].Cards = append(g.Ongoing.Players[i].Cards, PlayerCard{Idx: idx, Name: card})
+
 			PokerPubSub.Pub(roomTopic, evt)
-			PokerPubSub.Pub(roomTopic+"_"+p.Username, YourCardEvent{Idx: j, Name: card})
+			PokerPubSub.Pub(roomTopic+"_"+p.Username, YourCardEvent{Idx: cardIdx, Name: card})
+
+			g.Ongoing.Players[i].Cards = append(g.Ongoing.Players[i].Cards, PlayerCard{Idx: idx, Name: card})
 			g.Ongoing.Events = append(g.Ongoing.Events, evt)
 		}
 	}