Minor bug fixing, added blinds round

include/dawn/poker/poker.h

@@ -49,9 +49,6 @@ typedef struct {
   /** The current player that is the dealer */
   uint8_t roundDealer;
 
-  /** The current round the game is on */
-  uint8_t round;
-
   /** Which player is the small blind for this round */
   uint8_t roundSmallBlind;
   /** Which player is the big blind for this round */

src/display/gui/font.c

@@ -84,6 +84,9 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
   // Prepare the line counters
   info->lines[0].start = 0;
   info->lines[0].length = 0;
+
+  // Reset Dimensions
+  info->width = 0, info->height = 0;
   
   // Setup the initial loop state, and X/Y coords for the quad.
   i = 0;

src/game/poker/pokergame.c

@@ -19,14 +19,20 @@ bool pokerGameInit(game_t *game) {
   // Prep the VN Conversation Engine.
   vnSceneInit(&pokerGame->scene, &pokerGame->assets.font);
 
-  vnConversationTalk(&pokerGame->scene.conversation, "Start Match", NULL);
+  vnConversationTalk(&pokerGame->scene.conversation, "LOTS AND LOTS AND LOTS AND LOTS AND LOTS AND LOTS AND LOTS AND LOTS", NULL);
   pokerActionMatchAdd(&pokerGame->scene.conversation.actionQueue, &pokerGame->poker);
+  
   vnConversationTalk(&pokerGame->scene.conversation, "Start Round", NULL);
   pokerActionRoundAdd(&pokerGame->scene.conversation.actionQueue, &pokerGame->poker);
+  
+  vnConversationTalk(&pokerGame->scene.conversation, "Blinds Round", NULL);
+  pokerActionBlindsAdd(&pokerGame->scene.conversation.actionQueue, &pokerGame->poker);
+
   vnConversationTalk(&pokerGame->scene.conversation, "Deal Round", NULL);
   pokerActionDealAdd(&pokerGame->scene.conversation.actionQueue, &pokerGame->poker);
+  
   vnConversationTalk(&pokerGame->scene.conversation, "Betting Round", NULL);
-  // Betting round
+
   vnConversationTalk(&pokerGame->scene.conversation, "Flop Round", NULL);
   pokerActionFlopAdd(&pokerGame->scene.conversation.actionQueue, &pokerGame->poker);
 

src/game/poker/pokergame.h

@@ -16,6 +16,7 @@
 #include "../../poker/actions/round.h"
 #include "../../poker/actions/flop.h"
 #include "../../poker/actions/deal.h"
+#include "../../poker/actions/blinds.h"
 
 /**
  * Initializes the game state for the poker game.

src/poker/actions/blinds.c

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "blinds.h"
+
+void _pokerActionBlindsOnStart(queue_t *queue,queueaction_t *action,uint8_t i) {
+  poker_t *poker;
+  poker = (poker_t *)action->data;
+
+  pokerBetTakeBlinds(poker);
+  printf("Taken Blinds\n");
+  queueNext(queue);
+}
+
+
+queueaction_t * pokerActionBlindsAdd(queue_t *queue, poker_t *poker) {
+  queueaction_t *action;
+  action = queueAdd(queue);
+  action->data = (void *)poker;
+  action->onStart = &_pokerActionBlindsOnStart;
+  return action;
+}

src/poker/actions/blinds.h

@@ -0,0 +1,23 @@
+/**
+ * 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 "../../display/animation/queue.h"
+#include "../bet.h"
+
+/** Callback for the blinds action */
+void _pokerActionBlindsOnStart(queue_t *queue,queueaction_t *action,uint8_t i);
+
+/**
+ * Adds a blinds action onto the specified queue.
+ * 
+ * @param queue Queue to add to.
+  * @param poker Poker game instance to deal.
+  * @return The queued action.
+ */
+queueaction_t * pokerActionBlindsAdd(queue_t *queue, poker_t *poker);

src/poker/actions/deal.h

@@ -10,6 +10,14 @@
 #include "../../display/animation/queue.h"
 #include "../dealer.h"
 
+/** Callback for the deal action */
 void _pokerActionDealOnStart(queue_t *queue, queueaction_t *action, uint8_t i);
 
+/**
+ * Adds a deal action onto the specified queue.
+ * 
+ * @param queue Queue to add to.
+  * @param poker Poker game instance to deal.
+  * @return The queued action.
+ */
 queueaction_t * pokerActionDealAdd(queue_t *queue, poker_t *poker);

src/poker/actions/match.c

@@ -16,7 +16,6 @@ void _pokerActionMatchOnStart(queue_t *queue, queueaction_t *action, uint8_t i){
   // Reset the main game state. This does not init the round.
   pokerBetInit(&poker->bet);
   poker->roundDealer = POKER_PLAYER_COUNT-2;
-  poker->round = POKER_ROUND_MATCH;
 
   for(x = 0; x < POKER_PLAYER_COUNT; x++) {
     poker->players[x].state = 0x00;

src/poker/actions/round.c

@@ -15,10 +15,7 @@ void _pokerActionRoundOnStart(queue_t *queue, queueaction_t *action ,uint8_t i){
 
   poker = (poker_t *)action->data;
 
-  poker->round = POKER_ROUND_START;
-
   // Prepare the initial game state
-  poker->round = POKER_ROUND_DEAL;
   pokerBetReset(&poker->bet);
   pokerDealerInit(&poker->dealer);