From 1bf45379af35a42e687df810f731927ee1bdf9c1 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sat, 9 Oct 2021 21:33:14 -0700
Subject: [PATCH] Still working on updating code to new poker code.

---
 backup/poker/actions/round.c           | 68 ---------------------
 src/game/poker/actions/bet.c           | 81 +++++++++++++-------------
 src/game/poker/actions/flop.c          | 34 +++++------
 src/game/poker/actions/round.c         |  8 ++-
 src/game/poker/actions/start.c         |  3 -
 src/game/poker/actions/winner.c        | 13 +++--
 {backup => src}/poker/actions/blinds.c | 13 ++---
 {backup => src}/poker/actions/blinds.h |  1 -
 {backup => src}/poker/actions/deal.c   |  8 +--
 {backup => src}/poker/actions/deal.h   |  1 -
 {backup => src}/poker/actions/flop.c   | 30 +++++-----
 {backup => src}/poker/actions/flop.h   |  2 -
 {backup => src}/poker/actions/match.c  | 15 ++---
 {backup => src}/poker/actions/match.h  |  1 -
 src/poker/actions/round.c              | 36 ++++++++++++
 {backup => src}/poker/actions/round.h  |  3 -
 src/poker/poker.c                      | 16 +++++
 src/poker/poker.h                      | 12 ++++
 test/poker/poker.c                     | 32 ++++++++--
 test/poker/poker.h                     |  4 +-
 test/tests.c                           |  4 +-
 21 files changed, 196 insertions(+), 189 deletions(-)
 delete mode 100644 backup/poker/actions/round.c
 rename {backup => src}/poker/actions/blinds.c (77%)
 rename {backup => src}/poker/actions/blinds.h (96%)
 rename {backup => src}/poker/actions/deal.c (78%)
 rename {backup => src}/poker/actions/deal.h (96%)
 rename {backup => src}/poker/actions/flop.c (75%)
 rename {backup => src}/poker/actions/flop.h (97%)
 rename {backup => src}/poker/actions/match.c (61%)
 rename {backup => src}/poker/actions/match.h (96%)
 create mode 100644 src/poker/actions/round.c
 rename {backup => src}/poker/actions/round.h (91%)

diff --git a/backup/poker/actions/round.c b/backup/poker/actions/round.c
deleted file mode 100644
index d11737de..00000000
--- a/backup/poker/actions/round.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "round.h"
-
-void _pokerActionRoundOnStart(queue_t *queue, queueaction_t *action ,uint8_t i){
-  uint8_t j, indexDealer, indexSmallBlind, indexBigBlind;
-  bool foundDealer, foundSmallBlind;
-  pokerplayer_t *player;
-  poker_t *poker;
-
-  poker = (poker_t *)action->data;
-
-  // Update game state.
-  poker->state = POKER_STATE_STARTING_ROUND;
-
-  // Prepare the initial game state
-  pokerBetReset(&poker->bet);
-  pokerDealerInit(&poker->dealer);
-
-  // Reset the players
-  for(i = 0; i < POKER_PLAYER_COUNT; i++) {
-    pokerPlayerReset(poker->players + i);
-  }
-
-  // Decide on the dealer
-  poker->roundDealer = (poker->roundDealer+1) % POKER_PLAYER_COUNT;
-
-  // Find (and kill) the players.
-  j = poker->roundDealer;
-  foundDealer = false;
-  foundSmallBlind = false;
-  while(true) {
-    player = poker->players + j;
-
-    if(!pokerPlayerIsInRound(player)) continue;
-    if(!foundDealer) {
-      indexDealer = j;
-      foundDealer = true;
-    } else if(!foundSmallBlind) {
-      indexSmallBlind = j;
-      foundSmallBlind = true;
-    } else {
-      indexBigBlind = j;
-      break;
-    }
-    j = (j + 1) % POKER_PLAYER_COUNT;
-  }
-  
-  // Update players for the round.
-  poker->roundDealer = indexDealer;
-  poker->roundBigBlind = indexBigBlind;
-  poker->roundSmallBlind = indexSmallBlind;
-  
-  queueNext(queue);
-}
-
-queueaction_t * pokerActionRoundAdd(queue_t *queue, poker_t *poker) {
-  queueaction_t *action;
-  action = queueAdd(queue);
-  action->data = (void *)poker;
-  action->onStart = &_pokerActionRoundOnStart;
-  return action;
-}
\ No newline at end of file
diff --git a/src/game/poker/actions/bet.c b/src/game/poker/actions/bet.c
index 2532ae95..b4526097 100644
--- a/src/game/poker/actions/bet.c
+++ b/src/game/poker/actions/bet.c
@@ -13,46 +13,47 @@ void _pokerGameActionBetOnStart(
   bool isHuman;
   pokergame_t *game = (pokergame_t *)action->data;
 
+  //TODO: Fix this whole filee
   // Reset the UI state.
-  isHuman = game->poker.bet.better == POKER_PLAYER_HUMAN_INDEX;
-  if(isHuman) pokerUiBetShow(&game->ui);
+  // isHuman = game->poker.bet.better == POKER_PLAYER_HUMAN_INDEX;
+  // if(isHuman) pokerUiBetShow(&game->ui);
 }
 
 void _pokerGameActionBetOnUpdate(
   queue_t *queue, queueaction_t *action, uint8_t i
 ) {
   // Restack
-  bool isHuman;
-  bool turnMade = false;
-  pokerturn_t turn;
-  pokergame_t *game = (pokergame_t *)action->data;
-  pokerplayer_t *player;
-  pokerdiscussiondata_t discussion;
+  // bool isHuman;
+  // bool turnMade = false;
+  // pokerturn_t turn;
+  // pokergame_t *game = (pokergame_t *)action->data;
+  // pokerplayer_t *player;
+  // pokerdiscussiondata_t discussion;
   
-  // Are they human?
-  player = game->poker.players + game->poker.bet.better;
-  isHuman = game->poker.bet.better == POKER_PLAYER_HUMAN_INDEX;
+  // // Are they human?
+  // player = game->poker.players + game->poker.bet.better;
+  // isHuman = game->poker.bet.better == POKER_PLAYER_HUMAN_INDEX;
 
-  // Handle as an AI
-  if(isHuman) {
-    turn = game->ui.betTurn;
-    turnMade = game->ui.betTurnMade;
-  } else {
-    turn = pokerTurnGet(&game->poker, game->poker.bet.better);
-    turnMade = true;
-  }
+  // // Handle as an AI
+  // if(isHuman) {
+  //   turn = game->ui.betTurn;
+  //   turnMade = game->ui.betTurnMade;
+  // } else {
+  //   turn = pokerTurnGet(&game->poker, game->poker.bet.better);
+  //   turnMade = true;
+  // }
 
-  // Now decide if we should do something.
-  if(!turnMade) return;
+  // // Now decide if we should do something.
+  // if(!turnMade) return;
 
-  // Perform the action
-  pokerTurnAction(&game->poker, player, &turn);
+  // // Perform the action
+  // pokerTurnAction(&game->poker, player, &turn);
 
-  // Speak
-  discussion.reason = pokerDiscussionGetTypeFromTurnType(turn.type);
-  discussion.poker = game;
-  discussion.playerCause = game->poker.bet.better;
-  pokerDiscussionQueue(&discussion);
+  // // Speak
+  // discussion.reason = pokerDiscussionGetTypeFromTurnType(turn.type);
+  // discussion.poker = game;
+  // discussion.playerCause = game->poker.bet.better;
+  // pokerDiscussionQueue(&discussion);
 
   // Next.
   queueNext(queue);
@@ -63,20 +64,20 @@ void _pokerGameActionBetOnEnd(
 ) {
   pokergame_t *game = (pokergame_t *)action->data;
 
-  // Get which player is remaining to move.
-  game->poker.bet.better = pokerBetGetRemainingPlayer(
-    &game->poker.bet, game->poker.players, game->poker.roundSmallBlind
-  );
+  // // Get which player is remaining to move.
+  // game->poker.bet.better = pokerBetGetRemainingPlayer(
+  //   &game->poker.bet, game->poker.players, game->poker.roundSmallBlind
+  // );
 
-  // Restack
-  pokerGameActionRestackAdd(game);
+  // // Restack
+  // pokerGameActionRestackAdd(game);
 
-  // Are we waiting on any players?
-  if(game->poker.bet.better != 0xFF) {
-    pokerGameActionLookAdd(game, game->poker.bet.better);
-    pokerGameActionBetAdd(game);
-    return;
-  }
+  // // Are we waiting on any players?
+  // if(game->poker.bet.better != 0xFF) {
+  //   pokerGameActionLookAdd(game, game->poker.bet.better);
+  //   pokerGameActionBetAdd(game);
+  //   return;
+  // }
 
   // Not waiting, do next action.
   pokerGameActionFlopAdd(game);
diff --git a/src/game/poker/actions/flop.c b/src/game/poker/actions/flop.c
index cba4e207..726f8d9e 100644
--- a/src/game/poker/actions/flop.c
+++ b/src/game/poker/actions/flop.c
@@ -18,9 +18,9 @@ void _pokerGameActionFlopOnStart(
   discussion.poker = game;
 
   // Get how many players are left in the round.
-  if(pokerPlayerGetCountInRound(game->poker.players) > 1) {// Still more than 1
+  if(pokerInRoundGetCount(game->poker.players) > 1) {// Still more than 1
     // Add the actual flop action.
-    next = pokerActionNextFlopAdd(queue, &game->poker);
+    // next = pokerActionNextFlopAdd(queue, &game->poker);
 
     // Reset all the players 
 
@@ -30,23 +30,21 @@ void _pokerGameActionFlopOnStart(
       discussion.reason = POKER_DISCUSSION_REASON_FLOP;
       pokerDiscussionQueue(&discussion);
       
-      // Reset the better to the betting round initial.
-      pokerBetResetBetter(
-        &game->poker.bet, game->poker.players, game->poker.roundSmallBlind
-      );
+      // //TODO: Get the next player here.
+      // pokerPlayerGetRemainingBetter(&poker);
 
-      // Now, get the count of players left to bet. If "everyone is all in" then
-      // this will be 0 and no actual betting needs to happen.
-      if(pokerBetGetRemainingPlayerCount(
-        &game->poker.bet, game->poker.players
-      ) > 1) {
-        // Begin betting.
-        pokerGameActionLookAdd(game, game->poker.bet.better);
-        pokerGameActionBetAdd(game);
-      } else {
-        //No actual players to bet, so add the following flop instead.
-        pokerGameActionFlopAdd(game);
-      }
+      // // Now, get the count of players left to bet. If "everyone is all in" then
+      // // this will be 0 and no actual betting needs to happen.
+      // if(pokerBetGetRemainingPlayerCount(
+      //   &game->poker.bet, game->poker.players
+      // ) > 1) {
+      //   // Begin betting.
+      //   pokerGameActionLookAdd(game, game->poker.bet.better);
+      //   pokerGameActionBetAdd(game);
+      // } else {
+      //   //No actual players to bet, so add the following flop instead.
+      //   pokerGameActionFlopAdd(game);
+      // }
 
       // Do next action.
       queueNext(queue);
diff --git a/src/game/poker/actions/round.c b/src/game/poker/actions/round.c
index 7ac66475..28db8b4a 100644
--- a/src/game/poker/actions/round.c
+++ b/src/game/poker/actions/round.c
@@ -41,9 +41,11 @@ void _pokerGameActionRoundOnEnd(queue_t *queue,queueaction_t *action,uint8_t i){
 
   // Begin Betting Round. This will queue for one player only and then the round
   // will take over.
-  pokerBetResetBetter(
-    &game->poker.bet, game->poker.players, game->poker.roundSmallBlind
-  );
+
+  // TODO: finish
+  // pokerBetResetBetter(
+  //   &game->poker.bet, game->poker.players, game->poker.roundSmallBlind
+  // );
   pokerGameActionBetAdd(game);
 }
 
diff --git a/src/game/poker/actions/start.c b/src/game/poker/actions/start.c
index 8a587819..7469fdc7 100644
--- a/src/game/poker/actions/start.c
+++ b/src/game/poker/actions/start.c
@@ -17,9 +17,6 @@ void _pokerGameActionStartOnEnd(queue_t *queue,queueaction_t *action,uint8_t i){
   pokerdiscussiondata_t data;
   pokergame_t *game = (pokergame_t *)action->data;
 
-  // Begin the match
-  pokerInit(&game->poker);
-
   // Say that.
   data.poker = game;
   data.reason = POKER_DISCUSSION_REASON_MATCH_START;
diff --git a/src/game/poker/actions/winner.c b/src/game/poker/actions/winner.c
index 5e05f22d..31f5413e 100644
--- a/src/game/poker/actions/winner.c
+++ b/src/game/poker/actions/winner.c
@@ -14,14 +14,15 @@ void _pokerGameActionWinnerOnStart(
   pokergame_t *game = (pokergame_t *)action->data;
 
   // Calculate the winners
-  pokerWinnerCalculate(
-    &game->poker.winner,
-    &game->poker.dealer,
-    game->poker.players
-  );
+  // TODO: Calculate Winners
+  // pokerWinnerCalculate(
+  //   &game->poker.winner,
+  //   &game->poker.dealer,
+  //   game->poker.players
+  // );
 
   // Action
-  pokerGameWin(&game->poker);
+  // pokerGameWin(&game->poker);
 
   // Say stuff
   discussion.reason = POKER_DISCUSSION_REASON_BETTING_DONE;
diff --git a/backup/poker/actions/blinds.c b/src/poker/actions/blinds.c
similarity index 77%
rename from backup/poker/actions/blinds.c
rename to src/poker/actions/blinds.c
index c0751e58..ae3646ff 100644
--- a/backup/poker/actions/blinds.c
+++ b/src/poker/actions/blinds.c
@@ -10,13 +10,12 @@
 void _pokerActionBlindsOnStart(queue_t *queue,queueaction_t *action,uint8_t i) {
   poker_t *poker;
   poker = (poker_t *)action->data;
-  poker->state = POKER_STATE_TAKING_BLINDS;
-  pokerBetTakeBlinds(
-    &poker->bet,
-    poker->players, 
-    poker->roundSmallBlind, 
-    poker->roundBigBlind
-  );
+
+  // TODO: Fix State
+  // poker->state = POKER_STATE_TAKING_BLINDS;
+  // TODO: Fix Blinds
+  // pokerTakeBlinds(&poker, poker->blindSmall, poker->blindBig);
+
   printf("Taken Blinds\n");
   queueNext(queue);
 }
diff --git a/backup/poker/actions/blinds.h b/src/poker/actions/blinds.h
similarity index 96%
rename from backup/poker/actions/blinds.h
rename to src/poker/actions/blinds.h
index 20c67e60..b98ec22b 100644
--- a/backup/poker/actions/blinds.h
+++ b/src/poker/actions/blinds.h
@@ -6,7 +6,6 @@
  */
 
 #pragma once
-#include "../bet.h"
 #include "../poker.h"
 #include "../../libs.h"
 #include "../../display/animation/queue.h"
diff --git a/backup/poker/actions/deal.c b/src/poker/actions/deal.c
similarity index 78%
rename from backup/poker/actions/deal.c
rename to src/poker/actions/deal.c
index f16cb21c..2f3e01c7 100644
--- a/backup/poker/actions/deal.c
+++ b/src/poker/actions/deal.c
@@ -11,13 +11,13 @@ void _pokerActionDealOnStart(queue_t *queue, queueaction_t *action, uint8_t i) {
   poker_t *poker;
   poker = (poker_t *)action->data;
 
-
   // Shuffle the deck
-  poker->state = POKER_STATE_DEALING;
-  cardShuffle(poker->dealer.deck, CARD_DECK_SIZE);
+  // TODO: State yknow
+  // poker->state = POKER_STATE_DEALING;
+  cardShuffle(poker->deck, CARD_DECK_SIZE);
 
   // Deal 2 card to each player
-  pokerDealerDealAll(&poker->dealer, poker->players, POKER_DEAL_CARD_EACH);
+  pokerPlayerDealAll(poker, POKER_PLAYER_HAND_SIZE_MAX);
   queueNext(queue);
 }
 
diff --git a/backup/poker/actions/deal.h b/src/poker/actions/deal.h
similarity index 96%
rename from backup/poker/actions/deal.h
rename to src/poker/actions/deal.h
index dc433c5f..1ff53977 100644
--- a/backup/poker/actions/deal.h
+++ b/src/poker/actions/deal.h
@@ -8,7 +8,6 @@
 #pragma once
 #include "../../libs.h"
 #include "../../display/animation/queue.h"
-#include "../dealer.h"
 #include "../poker.h"
 
 /** Callback for the deal action */
diff --git a/backup/poker/actions/flop.c b/src/poker/actions/flop.c
similarity index 75%
rename from backup/poker/actions/flop.c
rename to src/poker/actions/flop.c
index f50302f9..1f6ea01e 100644
--- a/backup/poker/actions/flop.c
+++ b/src/poker/actions/flop.c
@@ -11,10 +11,10 @@ void _pokerActionFlopDo(queue_t *queue, queueaction_t *action, uint8_t count) {
   poker_t *poker;
   poker = (poker_t *)action->data;
 
-  poker->state = POKER_STATE_CARDS_FLOPPING;
-
-  pokerDealerBurn(&poker->dealer, POKER_FLOP_BURN_COUNT);
-  pokerDealerTurn(&poker->dealer, count);
+  // TODO: Fix State
+  // poker->state = POKER_STATE_CARDS_FLOPPING;
+  pokerBurn(&poker, POKER_FLOP_BURN_COUNT);
+  pokerTurn(&poker, count);
 
   printf("Turned %u cards\n", count);
   queueNext(queue);
@@ -57,17 +57,19 @@ queueaction_t * pokerActionRiverAdd(queue_t *queue, poker_t *poker) {
 }
 
 queueaction_t * pokerActionNextFlopAdd(queue_t *queue, poker_t *poker) {
-  switch(poker->dealer.cardsFacing) {
-    case 0:
-      return pokerActionFlopAdd(queue, poker);
+  // switch(poker->dealer.cardsFacing) {
+  //   case 0:
+  //     return pokerActionFlopAdd(queue, poker);
 
-    case POKER_FLOP_CARD_COUNT:
-      return pokerActionTurnAdd(queue, poker);
+  //   case POKER_FLOP_CARD_COUNT:
+  //     return pokerActionTurnAdd(queue, poker);
 
-    case POKER_FLOP_CARD_COUNT+POKER_TURN_CARD_COUNT:
-      return pokerActionRiverAdd(queue, poker);
+  //   case POKER_FLOP_CARD_COUNT+POKER_TURN_CARD_COUNT:
+  //     return pokerActionRiverAdd(queue, poker);
 
-    default:
-      return NULL;
-  }
+  //   default:
+  //     return NULL;
+  // }
+
+  return NULL;
 }
\ No newline at end of file
diff --git a/backup/poker/actions/flop.h b/src/poker/actions/flop.h
similarity index 97%
rename from backup/poker/actions/flop.h
rename to src/poker/actions/flop.h
index 4f93f1c9..ddf726ca 100644
--- a/backup/poker/actions/flop.h
+++ b/src/poker/actions/flop.h
@@ -8,9 +8,7 @@
 #pragma once
 #include "../../libs.h"
 #include "../../display/animation/queue.h"
-#include "../dealer.h"
 #include "../poker.h"
-#include "../turn.h"
 
 /** How many cards the dealer should burn before dealing the flop */
 #define POKER_FLOP_BURN_COUNT 1
diff --git a/backup/poker/actions/match.c b/src/poker/actions/match.c
similarity index 61%
rename from backup/poker/actions/match.c
rename to src/poker/actions/match.c
index 9ba1c7d1..fe263b1d 100644
--- a/backup/poker/actions/match.c
+++ b/src/poker/actions/match.c
@@ -13,17 +13,14 @@ void _pokerActionMatchOnStart(queue_t *queue, queueaction_t *action, uint8_t i){
 
   poker = (poker_t *)action->data;
 
-  poker->state = POKER_STATE_STARTING_MATCH;
+  // TODO: Fix state
+  // poker->state = POKER_STATE_STARTING_MATCH;
 
-  // Reset the main game state. This does not init the round.
-  pokerBetInit(&poker->bet);
-  poker->roundDealer = POKER_PLAYER_COUNT-2;
+  // Reset the main game state. This will also init the round.
+  pokerInit(&poker);
+
+  //TODO: Add Players here
   
-  // Reset the players
-  for(x = 0; x < POKER_PLAYER_COUNT; x++) {
-    poker->players[x].state = 0x00;
-    poker->players[x].chips = POKER_BET_PLAYER_CHIPS_DEFAULT;
-  }
   queueNext(queue);
 }
 
diff --git a/backup/poker/actions/match.h b/src/poker/actions/match.h
similarity index 96%
rename from backup/poker/actions/match.h
rename to src/poker/actions/match.h
index ef76cad5..6767226b 100644
--- a/backup/poker/actions/match.h
+++ b/src/poker/actions/match.h
@@ -6,7 +6,6 @@
 #pragma once
 #include "../../libs.h"
 #include "../../display/animation/queue.h"
-#include "../bet.h"
 #include "../poker.h"
 
 /** Callback for when the poker match aciton starts */
diff --git a/src/poker/actions/round.c b/src/poker/actions/round.c
new file mode 100644
index 00000000..98cd10ab
--- /dev/null
+++ b/src/poker/actions/round.c
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "round.h"
+
+void _pokerActionRoundOnStart(queue_t *queue, queueaction_t *action ,uint8_t i){
+  uint8_t j, indexDealer, indexSmallBlind, indexBigBlind;
+  bool foundDealer, foundSmallBlind;
+  pokerplayer_t *player;
+  poker_t *poker;
+
+  poker = (poker_t *)action->data;
+
+  // TODO: Fix State
+  // poker->state = POKER_STATE_STARTING_ROUND;
+
+  // Prepare the initial game stat
+  pokerResetRound(&poker);
+
+  // Decide on the dealer
+  pokerNewDealer(&poker);
+  
+  queueNext(queue);
+}
+
+queueaction_t * pokerActionRoundAdd(queue_t *queue, poker_t *poker) {
+  queueaction_t *action;
+  action = queueAdd(queue);
+  action->data = (void *)poker;
+  action->onStart = &_pokerActionRoundOnStart;
+  return action;
+}
\ No newline at end of file
diff --git a/backup/poker/actions/round.h b/src/poker/actions/round.h
similarity index 91%
rename from backup/poker/actions/round.h
rename to src/poker/actions/round.h
index d32d72cf..9b6cdc86 100644
--- a/backup/poker/actions/round.h
+++ b/src/poker/actions/round.h
@@ -8,9 +8,6 @@
 #pragma once
 #include "../../libs.h"
 #include "../../display/animation/queue.h"
-#include "../dealer.h"
-#include "../bet.h"
-#include "../player.h"
 #include "../poker.h"
 
 /** Callback for when the poker round start aciton begins. */
diff --git a/src/poker/poker.c b/src/poker/poker.c
index b00992e2..f88d8256 100644
--- a/src/poker/poker.c
+++ b/src/poker/poker.c
@@ -192,6 +192,22 @@ int32_t pokerPlayerGetCallBet(poker_t *poker, pokerplayer_t *player) {
   return pokerGetCallValue(poker) - player->currentBet;
 }
 
+uint8_t pokerInRoundGetCount(poker_t *poker) {
+  uint8_t i, count;
+  pokerplayer_t *player;
+
+  count = 0;
+  for(i = 0; i < poker->playerCount; i++) {
+    player = poker->players + i;
+    if(player->state & (POKER_PLAYER_STATE_FOLDED | POKER_PLAYER_STATE_OUT)) {
+      continue;
+    }
+    count++;
+  }
+
+  return count;
+}
+
 // Betting
 void pokerPlayerBetPot(
   poker_t *poker, pokerpot_t *pot, uint8_t playerIndex, int32_t chips
diff --git a/src/poker/poker.h b/src/poker/poker.h
index b892b604..c9fad910 100644
--- a/src/poker/poker.h
+++ b/src/poker/poker.h
@@ -85,6 +85,11 @@
 /** The default blind cost for the small blind. (Defaults half big blind) */
 #define POKER_BET_BLIND_SMALL_DEFAULT (POKER_BET_BLIND_BIG_DEFAULT/2)
 
+/** How many cards are dealt for the flop, turn and river */
+#define POKER_FLOP_CARD_COUNT 3
+#define POKER_TURN_CARD_COUNT 1
+#define POKER_RIVER_CARD_COUNT 1
+
 typedef struct {
   /** Count of chips the player has */
   int32_t chips;
@@ -317,6 +322,13 @@ uint8_t pokerPlayerGetNextBetter(poker_t *poker, uint8_t current);
  */
 int32_t pokerPlayerGetCallBet(poker_t *poker, pokerplayer_t *player);
 
+/**
+ * Gets the count of players still currently left in the round.
+ * 
+ * @param poker Poker game instance.
+ * @return The count of players in the round.
+ */
+uint8_t pokerInRoundGetCount(poker_t *poker);
 
 /**
  * Let a player bet chips into the pot.
diff --git a/test/poker/poker.c b/test/poker/poker.c
index 53457e7f..b5692d3f 100644
--- a/test/poker/poker.c
+++ b/test/poker/poker.c
@@ -60,10 +60,6 @@ void test_pokerResetRound_should_ResetThePlayers(void) {
       POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[i].state
     );
     TEST_ASSERT_BITS_LOW(POKER_PLAYER_STATE_SHOWING, poker.players[i].state);
-    TEST_ASSERT_EQUAL_UINT8(
-      0xFF - POKER_PLAYER_STATE_FOLDED - POKER_PLAYER_STATE_HAS_BET_THIS_ROUND,
-      poker.players[i].state
-    );
   }
 }
 
@@ -677,6 +673,32 @@ void test_pokerPlayerGetCallBet_should_GetCallBet(void) {
   TEST_ASSERT_EQUAL_INT32(0, pokerPlayerGetCallBet(&poker,poker.players+p2));
 }
 
+void test_pokerInRoundGetCount(void) {
+  poker_t poker;
+  uint8_t p0, p1, p2;
+
+  pokerInit(&poker);
+  p0 = pokerPlayerAdd(&poker);
+  p1 = pokerPlayerAdd(&poker);
+  p2 = pokerPlayerAdd(&poker);
+
+  TEST_ASSERT_EQUAL_UINT8(0x00, pokerInRoundGetCount(&poker));
+
+  pokerPlayerChipsAdd(poker.players + p0, 10000);
+  TEST_ASSERT_EQUAL_UINT8(0x01, pokerInRoundGetCount(&poker));
+  pokerPlayerChipsAdd(poker.players + p1, 10000);
+  TEST_ASSERT_EQUAL_UINT8(0x02, pokerInRoundGetCount(&poker));
+  pokerPlayerChipsAdd(poker.players + p2, 10000);
+  TEST_ASSERT_EQUAL_UINT8(0x03, pokerInRoundGetCount(&poker));
+
+  poker.players[0].state |= POKER_PLAYER_STATE_FOLDED;
+  TEST_ASSERT_EQUAL_UINT8(0x02, pokerInRoundGetCount(&poker));
+  poker.players[1].state |= POKER_PLAYER_STATE_FOLDED;
+  TEST_ASSERT_EQUAL_UINT8(0x01, pokerInRoundGetCount(&poker));
+  poker.players[2].state |= POKER_PLAYER_STATE_OUT;
+  TEST_ASSERT_EQUAL_UINT8(0x00, pokerInRoundGetCount(&poker));
+}
+
 void test_pokerPlayerBetPot_should_AddChipsToThePot(void) {
   poker_t poker;
   pokerpot_t *pot;
@@ -1418,7 +1440,6 @@ void test_pokerWinnerDetermine_should_DecideTheWinnerCorrectly(void) {
   TEST_ASSERT_EQUAL_UINT8(1, participants[1]);
 }
 
-
 int test_poker() {
   UNITY_BEGIN();
 
@@ -1448,6 +1469,7 @@ int test_poker() {
   RUN_TEST(test_pokerPlayerGetRemainingBetter_should_ReturnRemainingBetters);
   RUN_TEST(test_pokerPlayerGetNextBetter_should_GetTheNextBetter);
   RUN_TEST(test_pokerPlayerGetCallBet_should_GetCallBet);
+  RUN_TEST(test_pokerInRoundGetCount);
   RUN_TEST(test_pokerPlayerBetPot_should_AddChipsToThePot);
   RUN_TEST(test_pokerPlayerBetPot_should_UpdatePlayerState);
   RUN_TEST(test_pokerPlayerBet_should_BetToTheActivePot);
diff --git a/test/poker/poker.h b/test/poker/poker.h
index a85bb158..edf3ac67 100644
--- a/test/poker/poker.h
+++ b/test/poker/poker.h
@@ -5,6 +5,6 @@
 
 #pragma once
 #include <unity.h>
-#include <poker2/poker.h>
+#include <poker/poker.h>
 
-int test_poker2();
\ No newline at end of file
+int test_poker();
\ No newline at end of file
diff --git a/test/tests.c b/test/tests.c
index 139272b3..5bf81215 100644
--- a/test/tests.c
+++ b/test/tests.c
@@ -6,11 +6,11 @@
  */
 
 #include "poker/card.h"
-#include "poker2/poker.h"
+#include "poker/poker.h"
 
 int main() {
   return (
     test_card() ||
-    test_poker2()
+    test_poker()
   ) || 0;
 }
\ No newline at end of file