dkforest

commit 8ab28bb6e44a259e0cc6bbf5c34af10f1a230db8
parent 47a0bca3526a2de51e7851d5426014ce086b3e53
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue,  5 Dec 2023 17:54:24 -0500

cleanup

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

1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/pkg/web/handlers/poker.go b/pkg/web/handlers/poker.go
@@ -193,7 +193,7 @@ func (g *PokerGame) Deal(roomID string) {
 						if evt.Player != p.Username {
 							continue
 						}
-						roomUserTopic := "room_" + roomID + "_" + g.Ongoing.Players[i].Username
+						roomUserTopic := "room_" + roomID + "_" + p.Username
 						if evt.Fold {
 							player.Folded = true
 							PokerPubSub.Pub(roomTopic, PlayerFoldEvent{Card1Idx: player.Cards[0].Idx, Card2Idx: player.Cards[1].Idx})
@@ -202,24 +202,24 @@ func (g *PokerGame) Deal(roomID string) {
 								break OUTER
 							}
 						} else if evt.Check {
-							if g.Ongoing.Players[i].Bet < minBet {
-								msg := fmt.Sprintf("Need to bet %d", minBet-g.Ongoing.Players[i].Bet)
+							if p.Bet < minBet {
+								msg := fmt.Sprintf("Need to bet %d", minBet-p.Bet)
 								PokerPubSub.Pub(roomUserTopic, ErrorMsgEvent{Message: msg})
 								fmt.Println(msg)
 								continue
 							}
 						} else if evt.Call {
-							bet := minBet - g.Ongoing.Players[i].Bet
-							if g.Ongoing.Players[i].Cash < bet {
-								bet = g.Ongoing.Players[i].Cash
-								g.Ongoing.Players[i].Bet += bet
-								g.Ongoing.Players[i].Cash = 0
+							bet := minBet - p.Bet
+							if p.Cash < bet {
+								bet = p.Cash
+								p.Bet += bet
+								p.Cash = 0
 								// All in
 							} else {
-								g.Ongoing.Players[i].Bet += bet
-								g.Ongoing.Players[i].Cash -= bet
+								p.Bet += bet
+								p.Cash -= bet
 							}
-							PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerIdx: i, Player: p.Username, Bet: bet, TotalBet: g.Ongoing.Players[i].Bet, Cash: g.Ongoing.Players[i].Cash})
+							PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerIdx: i, Player: p.Username, Bet: bet, TotalBet: p.Bet, Cash: p.Cash})
 						} else if evt.Bet > 0 {
 							if (p.Bet + evt.Bet) < minBet {
 								msg := fmt.Sprintf("Bet (%d) is too low. Must bet at least %d", evt.Bet, minBet-p.Bet)
@@ -230,9 +230,9 @@ func (g *PokerGame) Deal(roomID string) {
 								lastRisePlayerIdx = i
 							}
 							minBet = p.Bet + evt.Bet
-							g.Ongoing.Players[i].Bet += evt.Bet
-							g.Ongoing.Players[i].Cash -= evt.Bet
-							PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerIdx: i, Player: p.Username, Bet: evt.Bet, TotalBet: g.Ongoing.Players[i].Bet, Cash: g.Ongoing.Players[i].Cash})
+							p.Bet += evt.Bet
+							p.Cash -= evt.Bet
+							PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerIdx: i, Player: p.Username, Bet: evt.Bet, TotalBet: p.Bet, Cash: p.Cash})
 						}
 						break
 					}