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

Improving tests.

Browse Source
This commit is contained in:
Dominic Masters
2021-10-11 21:24:43 -07:00
parent 169a4e9632
commit a09e74ce76
6 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/glfwclient/glfwclient.h
View File

@ -17,12 +17,6 @@
#define GLFW_PLATFORM_INPUT_MOUSE_X (inputsource_t)0xFF
#define GLFW_PLATFORM_INPUT_MOUSE_Y (inputsource_t)0xFE
/** The current running game state. */
extern game_t *GAME_STATE;
/** The GLFW Window Context Pointer */
extern GLFWwindow *window;
/**
* Entry of the program
* @return 0 if success, anything else for failure.

10
src/game/poker/actions/flop.c
View File

@ -13,7 +13,6 @@ void _pokerGameActionFlopOnStart(
pokergame_t *game = (pokergame_t *)action->data;
pokerdiscussiondata_t discussion;
queueaction_t *next;
uint8_t nextBetter;
// Prep convo
discussion.poker = game;
@ -23,7 +22,8 @@ void _pokerGameActionFlopOnStart(
// Add the actual flop action.
next = pokerActionNextFlopAdd(queue, &game->poker);
// Reset all the players
// Reset all the players
pokerResetBettingRound(&game->poker);
// Is there any flop "left to do" ?
if(next != NULL) {
@ -31,14 +31,12 @@ void _pokerGameActionFlopOnStart(
discussion.reason = POKER_DISCUSSION_REASON_FLOP;
pokerDiscussionQueue(&discussion);
nextBetter = pokerPlayerGetRemainingBetter(&game->poker);
// 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) {
// Begin betting.
game->poker.better = nextBetter;
pokerGameActionLookAdd(game, nextBetter);
game->poker.better = pokerPlayerGetRemainingBetter(&game->poker);
pokerGameActionLookAdd(game, game->poker.better);
pokerGameActionBetAdd(game);
} else {
//No actual players to bet, so add the following flop instead.

2
src/game/poker/actions/flop.h
View File

@ -12,7 +12,7 @@
#include "restack.h"
#include "winner.h"
#include "bet.h"
#include "../../poker/actions/flop.h"
#include "../../../poker/actions/flop.h"
/** Callback that is fired when the flop action starts */
void _pokerGameActionFlopOnStart(

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

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

1
src/poker/poker.c
View File

@ -160,6 +160,7 @@ uint8_t pokerPlayerAdd(poker_t *poker) {
player->chips = 0;
player->currentBet = 0;
player->state = POKER_PLAYER_STATE_OUT;
player->timesRaised = 0;
return i;
}

2
test/poker/poker.c
View File

@ -288,7 +288,7 @@ void test_pokerPlayerAdd_should_ResetThePlayer(void) {
TEST_ASSERT_EQUAL_INT32(0, player->chips);
TEST_ASSERT_EQUAL_INT32(0, player->currentBet);
TEST_ASSERT_EQUAL_UINT8(0, player->cardCount);
TEST_ASSERT_EQUAL_UINT8(0, poker.players[i].timesRaised);
TEST_ASSERT_EQUAL_UINT8(0, player->timesRaised);
TEST_ASSERT_EQUAL_UINT8(POKER_PLAYER_STATE_OUT, player->state);
}