Nuked some more code.

include/dawn/cards/poker/holdem.h

@@ -80,7 +80,16 @@ typedef struct {
   uint32_t currentBet;
 } holdemplayer_t;
 
-/** Representation of a Texas Hold'em Match State */
+/** Callback for actions to use */
+typedef void (*holdemActionCallback)(int32_t index, void *data);
+
+/** Texas Hold'em Game action that can be queued and executed */
+typedef struct {
+  holdemActionCallback init;
+  holdemActionCallback update;
+  holdemActionCallback dispose;
+} holdemaction_t;
+
 typedef struct {
   /** Current Card Deck */
   card_t deck[CARD_DECK_SIZE];
@@ -101,20 +110,10 @@ typedef struct {
 
   /** Player States */
   holdemplayer_t players[HOLDEM_PLAYER_COUNT];
-} holdemmatch_t;
 
-/** Callback for actions to use */
-typedef void (*holdemActionCallback)(int32_t index, void *data);
 
-/** Texas Hold'em Game action that can be queued and executed */
-typedef struct {
-  holdemActionCallback init;
-  holdemActionCallback update;
-  holdemActionCallback dispose;
-} holdemaction_t;
 
-typedef struct {
-  holdemmatch_t match;
+
 
   texture_t *kagamiTexture;
   tileset_t *kagamiTileset;

src/card/action/ai.c

@@ -33,7 +33,7 @@ void actionAiUpdate(int32_t index, void *data) {
 
 void actionAiDispose(int32_t index, void *data) {
   // Do we need to do a flop?
-  if(HOLDEM_GAME_STATE.match.cardsFacing < HOLDEM_DEALER_HAND) {
+  if(HOLDEM_GAME_STATE.cardsFacing < HOLDEM_DEALER_HAND) {
     holdemActionAdd(actionFlop());
   }
 }

src/card/action/deal.c

@@ -15,10 +15,25 @@ holdemaction_t actionDeal() {
   };
 }
 
-void actionDealInit(int32_t i, void *data) {
+void actionDealInit(int32_t index, void *data) {
+  uint8_t i, j;
+  holdemplayer_t *player;
   logText("Dealing Cards");
-  holdemDealAll(&HOLDEM_GAME_STATE.match, HOLDEM_PLAYER_HAND);
-  holdemActionRemove(i);
+  
+  for(i = 0; i < 2; i++) {
+    for(j = 0; j < HOLDEM_PLAYER_COUNT; j++) {
+      player = HOLDEM_GAME_STATE.players + j;
+      cardDeal(HOLDEM_GAME_STATE.deck,
+        player->cards,
+        HOLDEM_GAME_STATE.deckSize,
+        player->cardCount
+      );
+      HOLDEM_GAME_STATE.deckSize--;
+      player->cardCount++;
+    }
+  }
+
+  holdemActionRemove(index);
 }
 
 void actionDealUpdate(int32_t i, void *data) {

src/card/action/flop.c

@@ -16,13 +16,27 @@ holdemaction_t actionFlop() {
 }
 
 void actionFlopInit(int32_t index, void *data) {
+  uint8_t i, count;
   logText("Flop");
   
   // Look at the dealer
   holdemRenderLookHand(&HOLDEM_GAME_STATE.cameraLeft, HOLDEM_GAME_SEAT_DEALER);
 
   // Do the flop
-  holdemFlop(&HOLDEM_GAME_STATE.match);
+  // if(match->cardsFacing >= HOLDEM_DEALER_HAND) return;
+
+  // Burn the card off the top
+  HOLDEM_GAME_STATE.deckSize -= 1;
+
+  // Change count depending on facing
+  count = HOLDEM_GAME_STATE.cardsFacing == 0 ? 0x03 : 0x01;
+
+  // Deal
+  for(i = 0; i < count; i++) {
+    cardDeal(HOLDEM_GAME_STATE.deck, HOLDEM_GAME_STATE.cards, HOLDEM_GAME_STATE.deckSize, HOLDEM_GAME_STATE.cardsFacing);
+    HOLDEM_GAME_STATE.deckSize -= 1;
+    HOLDEM_GAME_STATE.cardsFacing += 1;
+  }
 
   // Next action
   holdemActionRemove(index);

src/card/action/flop.h

@@ -7,10 +7,9 @@
 
 #pragma once
 #include <dawn/dawn.h>
-#include "action.h"
-#include "../holdem.h"
-#include "../render/look.h"
 #include "../../debug/log.h"
+#include "../render/look.h"
+#include "action.h"
 #include "ai.h"
 
 holdemaction_t actionFlop();

src/card/action/round.c

@@ -18,7 +18,6 @@ holdemaction_t actionRound() {
 void actionRoundInit(int32_t index, void *data) {
   uint8_t i;
   holdemplayer_t *player;
-  holdemmatch_t *match = &HOLDEM_GAME_STATE.match;
 
   logText("Round Start");
 
@@ -26,14 +25,14 @@ void actionRoundInit(int32_t index, void *data) {
   holdemRenderLookHand(&HOLDEM_GAME_STATE.cameraLeft, HOLDEM_GAME_SEAT_DEALER);
 
   // Init the round and shuffle the deck
-  cardDeckFill(match->deck);
-  match->deckSize = CARD_DECK_SIZE;
-  match->pot = 0;
-  match->cardsFacing = 0;
+  cardDeckFill(HOLDEM_GAME_STATE.deck);
+  HOLDEM_GAME_STATE.deckSize = CARD_DECK_SIZE;
+  HOLDEM_GAME_STATE.pot = 0;
+  HOLDEM_GAME_STATE.cardsFacing = 0;
   
   // Reset the players
   for(i = 0; i < HOLDEM_PLAYER_COUNT; i++) {
-    player = match->players + i;
+    player = HOLDEM_GAME_STATE.players + i;
 
     // Clear Round State(s)
     player->state &= ~(

src/card/action/round.h

@@ -9,7 +9,6 @@
 #include <dawn/dawn.h>
 #include "../render/look.h"
 #include "../../debug/log.h"
-#include "../holdem.h"
 #include "action.h"
 #include "ai.h"
 #include "shuffle.h"

src/card/action/shuffle.c

@@ -17,7 +17,7 @@ holdemaction_t actionShuffle() {
 
 void actionShuffleInit(int32_t index, void *data) {
   logText("Shuffle Deck");
-  cardShuffle(HOLDEM_GAME_STATE.match.deck, HOLDEM_GAME_STATE.match.deckSize);
+  cardShuffle(HOLDEM_GAME_STATE.deck, HOLDEM_GAME_STATE.deckSize);
   holdemActionRemove(index);
 }
 

src/card/action/start.c

@@ -20,17 +20,16 @@ holdemaction_t actionStart() {
 void actionStartInit(int32_t index, void *data) {
   uint8_t i;
   holdemplayer_t *player;
-  holdemmatch_t *match;
   logText("Holdem Starting");
 
   // Prepare the match
-  match = &HOLDEM_GAME_STATE.match;
-  match->blindBig = 0;
-  match->blindSmall = 0;
+  HOLDEM_GAME_STATE.blindBig = 0;
+  HOLDEM_GAME_STATE.blindSmall = 0;
+  HOLDEM_GAME_STATE.pot = 0;
 
   // Reset the players
   for(i = 0; i < HOLDEM_PLAYER_COUNT; i++) {
-    player = match->players + i;
+    player = HOLDEM_GAME_STATE.players + i;
     player->state = 0x00;
     player->chips = 0;
   }

src/card/holdem.c

@@ -1,49 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "holdem.h"
-
-void holdemDeal(holdemmatch_t *match, holdemplayer_t *player) {
-  cardDeal(match->deck, player->cards, match->deckSize, player->cardCount);
-  match->deckSize--;
-  player->cardCount++;
-}
-
-void holdemDealAll(holdemmatch_t *match, uint8_t count) {
-  uint8_t i, j;
-  for(i = 0; i < count; i++) {
-    for(j = 0; j < HOLDEM_PLAYER_COUNT; j++) {
-      holdemDeal(match, match->players + j);
-    }
-  }
-}
-
-void holdemFlop(holdemmatch_t *match) {
-  if(match->cardsFacing >= HOLDEM_DEALER_HAND) return;
-  uint8_t i, count;
-
-
-  // Burn the card off the top
-  match->deckSize -= 1;
-
-  // Change count depending on facing
-  count = match->cardsFacing == 0 ? 0x03 : 0x01;
-
-  // Deal
-  for(i = 0; i < count; i++) {
-    cardDeal(match->deck, match->cards, match->deckSize, match->cardsFacing);
-    match->deckSize -= 1;
-    match->cardsFacing += 1;
-  }
-}
-
-uint32_t holdemBet(holdemmatch_t *match, holdemplayer_t *player, uint32_t amount) {
-  uint32_t realAmount = mathMin(player->chips, amount);
-  match->pot += realAmount;
-  player->chips -= realAmount;
-  return realAmount;
-}

src/card/holdem.h

@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include <dawn/dawn.h>
-#include "card.h"
-#include "../display/spritebatch.h"
-#include "../display/texture.h"
-#include "../display/tileset.h"
-#include "../display/shader.h"
-#include "../file/asset.h"
-
-/**
- * Deals a card to the given player, does all the follow up.
- * 
- * @param game Game who's deck to deal from.
- * @param player Player to deal into.
- */
-void holdemDeal(holdemmatch_t *match, holdemplayer_t *player);
-
-/**
- * Deal cards to all players.
- * 
- * @param game Game and players to deal around.
- * @param count Count of cards to deal to each player.
- */
-void holdemDealAll(holdemmatch_t *match, uint8_t count);
-
-/**
- * Draw the flop, turn or river
- * 
- * @param game Game to flop/turn/river.
- */
-void holdemFlop(holdemmatch_t *match);
-
-/**
- * Takes the given bet from a player
- * 
- * @param game Game to add the bet to.
- * @param player Player to take the bet from.
- * @param amount Amount to try and take.
- * @return The real amount that was taken, chips considered.
- */
-uint32_t holdemBet(holdemmatch_t *match, holdemplayer_t *player, uint32_t amount);

src/card/holdemgame.h

@@ -9,7 +9,6 @@
 #include <dawn/dawn.h>
 #include "../file/asset.h"
 #include "../display/gui/font.h"
-#include "holdem.h"
 #include "card.h"
 #include "action/action.h"
 #include "action/start.h"

src/card/render/world.c

@@ -16,17 +16,17 @@ void holdemRenderWorld() {
 
   // Render the dealer and her hand
   holdemRenderPlayer(HOLDEM_GAME_SEAT_DEALER);
-  for(i = 0x00; i < HOLDEM_GAME_STATE.match.cardsFacing; i++) {
+  for(i = 0x00; i < HOLDEM_GAME_STATE.cardsFacing; i++) {
     holdemRenderCardForSeat(
       HOLDEM_GAME_SEAT_DEALER,
-      HOLDEM_GAME_STATE.match.cards[i],
+      HOLDEM_GAME_STATE.cards[i],
       HOLDEM_GAME_CARD_SLOT_FLOP0 + i
     );
   }
 
   // Test
   for(i = 0x00; i < HOLDEM_PLAYER_COUNT; i++) {
-    player = HOLDEM_GAME_STATE.match.players + i;
+    player = HOLDEM_GAME_STATE.players + i;
     seat = holdemRenderPlayerGetSeatForPlayer(i);
     holdemRenderPlayer(seat);