Just cleaning

This commit is contained in:
2021-10-14 21:32:51 -07:00
parent 9a9e1d156c
commit e9c8d37360
17 changed files with 228 additions and 226 deletions

View File

@ -64,9 +64,7 @@ void _pokerGameActionBetOnEnd(
pokergame_t *game = (pokergame_t *)action->data;
// // Get which player is remaining to move.
game->poker.better = pokerPlayerGetNextBetter(
&game->poker, game->poker.better
);
game->poker.better = pokerBetGetNextPlayer(&game->poker);
// Restack
pokerGameActionRestackAdd(game);

View File

@ -7,6 +7,7 @@
#pragma once
#include "../../../libs.h"
#include "../../../poker/bet.h"
#include "../pokerdiscussion.h"
#include "action.h"
#include "restack.h"

View File

@ -26,16 +26,16 @@ void _pokerGameActionFlopOnStart(
hasDoneFlop = true;
switch(game->poker.communitySize) {
case 0x00:
pokerBurn(&game->poker, POKER_FLOP_BURN_COUNT);
pokerTurn(&game->poker, POKER_FLOP_CARD_COUNT);
pokerDealerBurn(&game->poker, POKER_FLOP_BURN_COUNT);
pokerDealerTurn(&game->poker, POKER_FLOP_CARD_COUNT);
break;
case POKER_FLOP_CARD_COUNT:
pokerBurn(&game->poker, POKER_FLOP_BURN_COUNT);
pokerTurn(&game->poker, POKER_TURN_CARD_COUNT);
pokerDealerBurn(&game->poker, POKER_FLOP_BURN_COUNT);
pokerDealerTurn(&game->poker, POKER_TURN_CARD_COUNT);
break;
case POKER_FLOP_CARD_COUNT+POKER_TURN_CARD_COUNT:
pokerBurn(&game->poker, POKER_FLOP_BURN_COUNT);
pokerTurn(&game->poker, POKER_RIVER_CARD_COUNT);
pokerDealerBurn(&game->poker, POKER_FLOP_BURN_COUNT);
pokerDealerTurn(&game->poker, POKER_RIVER_CARD_COUNT);
break;
default:
hasDoneFlop = false;
@ -50,9 +50,9 @@ void _pokerGameActionFlopOnStart(
// 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(pokerPlayerGetRemainingBetterCount(&game->poker) > 0x01) {
if(pokerBetGetRemainingPlayerCount(&game->poker) > 0x01) {
// Begin betting.
game->poker.better = pokerPlayerGetRemainingBetter(&game->poker);
game->poker.better = pokerBetGetRemainingPlayer(&game->poker);
pokerGameActionLookAdd(game, game->poker.better);
pokerGameActionBetAdd(game);
} else {

View File

@ -19,7 +19,7 @@ void _pokerGameActionRoundOnEnd(queue_t *queue,queueaction_t *action,uint8_t i){
// Start the round
pokerResetRound(&game->poker);
pokerNewDealer(&game->poker);
pokerDealerNew(&game->poker);
pokerTakeBlinds(&game->poker, game->poker.blindSmall, game->poker.blindBig);
// Speak

View File

@ -27,7 +27,7 @@ void _pokerGameActionStartOnEnd(queue_t *queue,queueaction_t *action,uint8_t i){
k = pokerPlayerAdd(&game->poker);
pokerPlayerChipsAdd(game->poker.players+k, POKER_BET_PLAYER_CHIPS_DEFAULT);
}
pokerSetDealer(&game->poker, game->poker.playerCount/2);
pokerDealerSet(&game->poker, game->poker.playerCount/2);
// Say that.
data.poker = game;

View File

@ -97,12 +97,12 @@ void pokerUiUpdate(
void pokerUiRender(
pokerui_t *ui, engine_t *engine, pokergameassets_t *assets, poker_t *poker
) {
uint8_t i, j;
pokerplayer_t *player;
// uint8_t i, j;
// pokerplayer_t *player;
float scale;
align_t align;
float gx, gy, gw, gh, x, y;
char message[128];
// align_t align;
// float gx, gy, gw, gh, x, y;
// char message[128];
// Get the default font scale size.
scale = fontGetScale(FONT_SIZE_DEFAULT);