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

Fixing more includes

Browse Source
This commit is contained in:
Dominic Masters
2021-10-15 10:20:31 -07:00
parent 54d45441c3
commit 5a585a7714
8 changed files with 61 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
src/poker/poker.c
View File

@ -70,8 +70,13 @@ void pokerResetBettingRound(poker_t *poker) {
}
void pokerTakeBlinds(poker_t *poker) {
pokerplayer_t *player;
pokerBetForPlayer(poker, poker->playerSmallBlind, poker->blindSmall);
player = poker->players + poker->playerSmallBlind;
player->state = flagOff(player->state, POKER_PLAYER_STATE_HAS_BET_THIS_ROUND);
pokerBetForPlayer(poker, poker->playerBigBlind, poker->blindBig);
player = poker->players + poker->playerBigBlind;
player->state = flagOff(player->state, POKER_PLAYER_STATE_HAS_BET_THIS_ROUND);
}
uint8_t pokerInRoundGetCount(poker_t *poker) {

10
src/poker/poker.h
View File

@ -8,16 +8,10 @@
#pragma once
#include "../libs.h"
#include "../util/flags.h"
#include "../util/array.h"
#include "../util/math.h"
#include "bet.h"
#include "card.h"
#include "dealer.h"
#include "fuck.h"
#include "player.h"
#include "card.h"
#include "pot.h"
#include "turn.h"
#include "winner.h"
#include "bet.h"
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Fucked if I know

1
src/poker/turn.h
View File

@ -13,7 +13,6 @@
#include "card.h"
#include "winner.h"
#include "pot.h"
#include "poker.h"//get callbet
/**
* Return a turn action for the given player to fold.

2
test/poker/bet.h
View File

@ -6,5 +6,7 @@
#pragma once
#include <unity.h>
#include <poker/bet.h>
#include <poker/poker.h>
#include <poker/dealer.h>
int test_bet_h();

1
test/poker/player.h
View File

@ -9,5 +9,6 @@
#include <unity.h>
#include <poker/poker.h>
#include <poker/player.h>
#include <poker/dealer.h>
int test_player_h();

49
test/poker/poker.c
View File

@ -126,6 +126,54 @@ void test_pokerTakeBlinds_should_TakeTheBlinds(void) {
TEST_ASSERT_EQUAL_INT32(800, (poker.players + 4)->chips);
}
void test_pokerTakeBlinds_should_NotCountAsBetting(void) {
poker_t poker;
pokerInit(&poker);
pokerSetBlinds(&poker, 100, 200);
pokerPlayerChipsAdd(poker.players + pokerPlayerAdd(&poker), 1000);
pokerPlayerChipsAdd(poker.players + pokerPlayerAdd(&poker), 1000);
pokerPlayerChipsAdd(poker.players + pokerPlayerAdd(&poker), 1000);
pokerPlayerChipsAdd(poker.players + pokerPlayerAdd(&poker), 1000);
pokerPlayerChipsAdd(poker.players + pokerPlayerAdd(&poker), 1000);
pokerDealerNew(&poker);
TEST_ASSERT_BIT_LOW(
POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[0].state
);
TEST_ASSERT_BIT_LOW(
POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[1].state
);
TEST_ASSERT_BIT_LOW(
POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[2].state
);
TEST_ASSERT_BIT_LOW(
POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[3].state
);
TEST_ASSERT_BIT_LOW(
POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[4].state
);
pokerTakeBlinds(&poker);
TEST_ASSERT_BIT_LOW(
POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[0].state
);
TEST_ASSERT_BIT_LOW(
POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[1].state
);
TEST_ASSERT_BIT_LOW(
POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[2].state
);
TEST_ASSERT_BIT_LOW(
POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[3].state
);
TEST_ASSERT_BIT_LOW(
POKER_PLAYER_STATE_HAS_BET_THIS_ROUND, poker.players[4].state
);
}
void test_pokerPlayerGetCallBet_should_GetCallBet(void) {
poker_t poker;
uint8_t p0, p1, p2;
@ -186,6 +234,7 @@ int test_poker_h() {
RUN_TEST(test_pokerResetBettingRound_should_ResetTheBettingRound);
RUN_TEST(test_pokerTakeBlinds_should_TakeTheBlinds);
RUN_TEST(test_pokerPlayerGetCallBet_should_GetCallBet);
RUN_TEST(test_pokerTakeBlinds_should_NotCountAsBetting);
RUN_TEST(test_pokerInRoundGetCount_should_ReturnCountOfPlayersInRound);
return UNITY_END();

1
test/poker/poker.h
View File

@ -6,5 +6,6 @@
#pragma once
#include <unity.h>
#include <poker/poker.h>
#include <poker/dealer.h>
int test_poker_h();