YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just cleaning

Browse Source
This commit is contained in:
Dominic Masters
2021-10-14 21:32:51 -07:00
parent 9a9e1d156c
commit e9c8d37360
17 changed files with 228 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/poker/actions/bet.c
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);

1
src/game/poker/actions/bet.h
View File

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

16
src/game/poker/actions/flop.c
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 {

2
src/game/poker/actions/round.c
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

2
src/game/poker/actions/start.c
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;

10
src/game/poker/pokerui.c
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);

29
src/poker/bet.c
View File

@ -7,7 +7,7 @@
#include "bet.h"
uint8_t pokerPlayerGetRemainingBetter(poker_t *poker) {
uint8_t pokerBetGetRemainingPlayer(poker_t *poker) {
uint8_t i, j;
for(i = 0; i < poker->playerCount; i++) {
@ -17,22 +17,16 @@ uint8_t pokerPlayerGetRemainingBetter(poker_t *poker) {
return 0xFF;
}
uint8_t pokerPlayerGetNextBetter(poker_t *poker, uint8_t current) {
uint8_t pokerBetGetNextPlayer(poker_t *poker) {
uint8_t i, j;
for(i = 0; i < poker->playerCount; i++) {
j = (i + current + 1) % poker->playerCount;
j = (i + poker->better + 1) % poker->playerCount;
if(pokerPlayerDoesNeedToBetThisRound(poker, j)) return j;
}
return 0xFF;
}
int32_t pokerPlayerGetCallBet(poker_t *poker, pokerplayer_t *player) {
return pokerGetCallValue(poker) - player->currentBet;
}
uint8_t pokerPlayerGetRemainingBetterCount(poker_t *poker) {
uint8_t pokerBetGetRemainingPlayerCount(poker_t *poker) {
uint8_t i, count;
count = 0;
for(i = 0; i < poker->playerCount; i++) {
@ -42,7 +36,7 @@ uint8_t pokerPlayerGetRemainingBetterCount(poker_t *poker) {
return count;
}
void pokerPlayerBetPot(
void pokerBet(
poker_t *poker, pokerpot_t *pot, uint8_t playerIndex, int32_t chips
) {
pokerplayer_t *player;
@ -54,8 +48,17 @@ void pokerPlayerBetPot(
pokerPotAddPlayer(pot, playerIndex);
}
void pokerPlayerBet(poker_t *poker, uint8_t playerIndex, int32_t chips) {
pokerPlayerBetPot(
void pokerBetForPlayer(poker_t *poker, uint8_t playerIndex, int32_t chips) {
pokerBet(
poker, poker->pots + (poker->potCount - 1), playerIndex, chips
);
}
//eh
int32_t pokerPlayerGetCallBet(poker_t *poker, pokerplayer_t *player) {
return pokerGetCallValue(poker) - player->currentBet;
}

11
src/poker/bet.h
View File

@ -10,7 +10,6 @@
#include "fuck.h"
#include "poker.h"
/**
* Returns the index of the first player that remains to bet for the current
* round.
@ -18,7 +17,7 @@
* @param poker Poker game instance.
* @return The player index of the remaining player, otherwise 0xFF.
*/
uint8_t pokerPlayerGetRemainingBetter(poker_t *poker);
uint8_t pokerBetGetRemainingPlayer(poker_t *poker);
/**
* Returns the index of the first player that remains to bet for the current
@ -28,7 +27,7 @@ uint8_t pokerPlayerGetRemainingBetter(poker_t *poker);
* @param current Current better player index.
* @return The player index of the next remaining player, otherwise 0xFF.
*/
uint8_t pokerPlayerGetNextBetter(poker_t *poker, uint8_t current);
uint8_t pokerBetGetNextPlayer(poker_t *poker);
/**
* Get the bet necessary for a specific player to make a call. This takes the
@ -47,7 +46,7 @@ int32_t pokerPlayerGetCallBet(poker_t *poker, pokerplayer_t *player);
* @param poker Poker game instance.
* @return Count of players left to bet.
*/
uint8_t pokerPlayerGetRemainingBetterCount(poker_t *poker);
uint8_t pokerBetGetRemainingPlayerCount(poker_t *poker);
/**
* Let a player bet chips into the pot.
@ -57,7 +56,7 @@ uint8_t pokerPlayerGetRemainingBetterCount(poker_t *poker);
* @param playerIndex The players' index that is betting.
* @param chips The amount of chips the player is betting.
*/
void pokerPlayerBetPot(
void pokerBet(
poker_t *poker, pokerpot_t *pot, uint8_t playerIndex, int32_t chips
);
@ -68,4 +67,4 @@ void pokerPlayerBetPot(
* @param playerIndex The players' index that is betting.
* @param chips The amount of chips the player is betting.
*/
void pokerPlayerBet(poker_t *poker, uint8_t playerIndex, int32_t chips);
void pokerBetForPlayer(poker_t *poker, uint8_t playerIndex, int32_t chips);

6
src/poker/card.c
View File

@ -6,8 +6,8 @@
*/
#include "card.h"
void cardDeal(card_t *source, uint8_t *sourceSize, card_t *dest,
uint8_t *destSize
void cardDeal(
card_t *source, uint8_t *sourceSize, card_t *dest, uint8_t *destSize
) {
card_t card;
uint8_t i;
@ -78,7 +78,7 @@ uint8_t cardWriteDeck(card_t *hand) {
return CARD_DECK_SIZE;
}
card_t cardGetHighestCard(card_t *cards, uint8_t cardCount) {
card_t cardGetHighest(card_t *cards, uint8_t cardCount) {
uint8_t i, number, bestNumber;
card_t card, bestCard;

6
src/poker/card.h
View File

@ -140,8 +140,8 @@ typedef uint8_t card_t;
* @param dest Array destination.
* @param destSize Pointer to the size of the destination array.
*/
void cardDeal(card_t *source, uint8_t *sourceSize, card_t *dest,
uint8_t *destSize
void cardDeal(
card_t *source, uint8_t *sourceSize, card_t *dest, uint8_t *destSize
);
/**
@ -211,4 +211,4 @@ uint8_t cardWriteDeck(card_t *hand);
* @param cardCount Length of the array.
* @return The highest card in the array.
*/
card_t cardGetHighestCard(card_t *cards, uint8_t cardCount);
card_t cardGetHighest(card_t *cards, uint8_t cardCount);

20
src/poker/dealer.c
View File

@ -7,11 +7,7 @@
#include "dealer.h"
void pokerNewDealer(poker_t *poker) {
pokerSetDealer(poker, poker->playerDealer + 1);
}
void pokerSetDealer(poker_t *poker, uint8_t dealer) {
void pokerDealerSet(poker_t *poker, uint8_t dealer) {
uint8_t i, k;
pokerplayer_t *player;
bool foundDealer;
@ -38,7 +34,11 @@ void pokerSetDealer(poker_t *poker, uint8_t dealer) {
}
}
void pokerTurn(poker_t *poker, uint8_t count) {
void pokerDealerNew(poker_t *poker) {
pokerDealerSet(poker, poker->playerDealer + 1);
}
void pokerDealerTurn(poker_t *poker, uint8_t count) {
uint8_t i;
for(i = 0; i < count; i++) {
cardDeal(
@ -47,21 +47,21 @@ void pokerTurn(poker_t *poker, uint8_t count) {
}
}
void pokerBurn(poker_t *poker, uint8_t count) {
void pokerDealerBurn(poker_t *poker, uint8_t count) {
uint8_t i;
for(i = 0; i < count; i++) {
cardDeal(poker->deck, &poker->deckSize, poker->grave, &poker->graveSize);
}
}
void pokerPlayerDeal(poker_t *poker, pokerplayer_t *player, uint8_t count) {
void pokerDeal(poker_t *poker, pokerplayer_t *player, uint8_t count) {
uint8_t i;
for(i = 0; i < count; i++) {
cardDeal(poker->deck, &poker->deckSize, player->cards, &player->cardCount);
}
}
void pokerPlayerDealAll(poker_t *poker, uint8_t count) {
void pokerDealAllPlayers(poker_t *poker, uint8_t count) {
uint8_t i, j;
pokerplayer_t *player;
@ -74,7 +74,7 @@ void pokerPlayerDealAll(poker_t *poker, uint8_t count) {
continue;
}
pokerPlayerDeal(poker, player, 1);
pokerDeal(poker, player, 1);
}
}
}

27
src/poker/dealer.h
View File

@ -8,14 +8,7 @@
#pragma once
#include "fuck.h"
#include "poker.h"
/**
* Cycles to the next dealer. This will also select the new small and big blind
* players.
*
* @param poker Poker game to select a new dealer for.
*/
void pokerNewDealer(poker_t *poker);
#include "card.h"
/**
* Set a next dealer. This will also select the new small and big blind players.
@ -24,7 +17,15 @@ void pokerNewDealer(poker_t *poker);
* @param poker Poker game to select a new dealer for.
* @param dealer Dealer to become the new dealer.
*/
void pokerSetDealer(poker_t *poker, uint8_t dealer);
void pokerDealerSet(poker_t *poker, uint8_t dealer);
/**
* Cycles to the next dealer. This will also select the new small and big blind
* players.
*
* @param poker Poker game to select a new dealer for.
*/
void pokerDealerNew(poker_t *poker);
/**
* Turns over cards from the deck onto the table (from the deck into the dealer
@ -33,7 +34,7 @@ void pokerSetDealer(poker_t *poker, uint8_t dealer);
* @param poker Poker game instance.
* @param count Count of cards to deal.
*/
void pokerTurn(poker_t *poker, uint8_t count);
void pokerDealerTurn(poker_t *poker, uint8_t count);
/**
* Burns a set of cards off the top of the deck into the graveyard.
@ -41,7 +42,7 @@ void pokerTurn(poker_t *poker, uint8_t count);
* @param poker Poker game instance.
* @param count Count of cards to burn.
*/
void pokerBurn(poker_t *poker, uint8_t count);
void pokerDealerBurn(poker_t *poker, uint8_t count);
/**
* Deal a card to a player.
@ -50,7 +51,7 @@ void pokerBurn(poker_t *poker, uint8_t count);
* @param player Poker player to deal to.
* @param count Count of cards to deal to the player.
*/
void pokerPlayerDeal(poker_t *poker, pokerplayer_t *player, uint8_t count);
void pokerDeal(poker_t *poker, pokerplayer_t *player, uint8_t count);
/**
* Deal card(s) to every active player.
@ -58,4 +59,4 @@ void pokerPlayerDeal(poker_t *poker, pokerplayer_t *player, uint8_t count);
* @param poker Poker game instance.
* @param count Count of cards to deal.
*/
void pokerPlayerDealAll(poker_t *poker, uint8_t count);
void pokerDealAllPlayers(poker_t *poker, uint8_t count);

6
src/poker/poker.c
View File

@ -66,12 +66,12 @@ void pokerResetBettingRound(poker_t *poker) {
// Then we check who's remaining. We do this because the default better may
// have folded already.
poker->better = pokerPlayerGetRemainingBetter(poker);
poker->better = pokerBetGetRemainingPlayer(poker);
}
void pokerTakeBlinds(poker_t *poker, int32_t small, int32_t big) {
pokerPlayerBet(poker, poker->playerSmallBlind, small);
pokerPlayerBet(poker, poker->playerBigBlind, big);
pokerBetForPlayer(poker, poker->playerSmallBlind, small);
pokerBetForPlayer(poker, poker->playerBigBlind, big);
pokerResetBettingRound(poker);
}

1
src/poker/poker.h
View File

@ -10,6 +10,7 @@
#include "../util/flags.h"
#include "../util/array.h"
#include "../util/math.h"
#include "bet.h"
#include "card.h"
#include "dealer.h"
#include "fuck.h"

6
src/poker/turn.c
View File

@ -110,7 +110,7 @@ pokerturn_t pokerTurnGetForPlayer(poker_t *poker, uint8_t playerIndex) {
(float)callBet + (float)pokerPlayerGetPotChipsSum(poker, playerIndex)
);
} else {
potOdds = 1.0f / (float)pokerPlayerGetRemainingBetterCount(poker);
potOdds = 1.0f / (float)pokerBetGetRemainingPlayerCount(poker);
}
// Now determine the expected ROI
@ -202,12 +202,12 @@ void pokerTurnAction(poker_t *poker, uint8_t playerIndex, pokerturn_t turn) {
case POKER_TURN_TYPE_BET:
case POKER_TURN_TYPE_CALL:
case POKER_TURN_TYPE_ALL_IN:
pokerPlayerBet(poker, playerIndex, turn.chips);
pokerBetForPlayer(poker, playerIndex, turn.chips);
player->timesRaised++;
break;
case POKER_TURN_TYPE_CHECK:
pokerPlayerBet(poker, playerIndex, 0);
pokerBetForPlayer(poker, playerIndex, 0);
player->timesRaised = 0;
break;