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

Added deal round, removed some logging

Browse Source
This commit is contained in:
Dominic Masters
2021-07-28 10:01:52 -07:00
parent e7a7fd9545
commit 188e57c3fd
5 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/poker/pokergame.c
View File

@ -23,8 +23,10 @@ bool pokerGameInit(game_t *game) {
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, "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);

1
src/game/poker/pokergame.h
View File

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

30
src/poker/actions/deal.c Normal file
View File

@ -0,0 +1,30 @@
/**
* Copyright (c) 2021 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#include "deal.h"
void _pokerActionDealOnStart(queue_t *queue, queueaction_t *action, uint8_t i) {
poker_t *poker;
poker = (poker_t *)action->data;
// Shuffle the deck
cardShuffle(poker->dealer.deck, CARD_DECK_SIZE);
// Deal 2 card to each player
pokerDealerDealAll(poker, POKER_DEAL_CARD_EACH);
printf("Cards Dealt\n");
queueNext(queue);
}
queueaction_t * pokerActionDealAdd(queue_t *queue, poker_t *poker) {
queueaction_t *action;
action = queueAdd(queue);
action->data = (void *)poker;
action->onStart = &_pokerActionDealOnStart;
return action;
}

15
src/poker/actions/deal.h Normal file
View File

@ -0,0 +1,15 @@
/**
* 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 "../dealer.h"
void _pokerActionDealOnStart(queue_t *queue, queueaction_t *action, uint8_t i);
queueaction_t * pokerActionDealAdd(queue_t *queue, poker_t *poker);

4
src/vn/conversation/talk.c
View File

@ -11,9 +11,6 @@ void _vnConversationTalkStart(queue_t *queue,queueaction_t *action,uint8_t i) {
vnconversationitemdata_t *data;
data = (vnconversationitemdata_t *)action->data;
printf("Speaking ");
printf(data->text);
printf("\n");
vnTextBoxSetText(&data->conversation->textbox, data->text);
if(data->character != NULL) {
@ -26,7 +23,6 @@ void _vnConversationTalkUpdate(queue_t *queue,queueaction_t *action,uint8_t i) {
data = (vnconversationitemdata_t *)action->data;
if(data->conversation->textbox.state & VN_TEXTBOX_STATE_CLOSED) {
printf("Spoke\n");
if(data->character != NULL) data->character->talking = false;
queueNext(queue);
}