diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/card_stack.c | 2 | ||||
| -rw-r--r-- | src/client_game_states.c | 3 | ||||
| -rw-r--r-- | src/server_game_states.c | 7 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/card_stack.c b/src/card_stack.c index f3bd217..b5cfa8a 100644 --- a/src/card_stack.c +++ b/src/card_stack.c @@ -58,7 +58,7 @@ void card_stack_push(card_stack_t *cs, const card c) } /** - * Replaces a card stack with a single card. All cards within the card stack will be removed adn the first card will be set to a given card. + * Replaces a card stack with a single card. All cards within the card stack will be removed and the first card will be set to a given card. * @param[in] cs The card stack to replace * @param[in] new_card The new first card */ diff --git a/src/client_game_states.c b/src/client_game_states.c index 686acb6..1938f16 100644 --- a/src/client_game_states.c +++ b/src/client_game_states.c @@ -56,8 +56,7 @@ game_state_t state_client_wait_for_open_cards(const int sock) ui_display_wnd_current_state(&d->player_list, d->player_list.count, true, 0, 0); // TODO fix parameters - //return STATE_CLIENT_PLAY_CARDS; - return STATE_CLIENT_SELECT_OPEN_CARD;; // just for testing + return STATE_CLIENT_PLAY_CARDS; } game_state_t state_client_play_cards(const int sock) diff --git a/src/server_game_states.c b/src/server_game_states.c index c3314ae..b0fb8ff 100644 --- a/src/server_game_states.c +++ b/src/server_game_states.c @@ -75,8 +75,7 @@ game_state_t state_server_wait_for_open_cards(const socket_list_t *client_socks) player_list_sort_by_open_card(&d->player_list, d->player_list.count); // sort in ascending order - //return STATE_SERVER_PLAY_CARDS; - return STATE_SERVER_WAIT_FOR_OPEN_CARDS; // just for testing + return STATE_SERVER_PLAY_CARDS; } game_state_t state_server_play_cards(const socket_list_t *client_socks, const main_stack_t *m) @@ -96,7 +95,7 @@ game_state_t state_server_play_cards(const socket_list_t *client_socks, const ma net_send(client_socks->sockets[i], msg_type_selected_stack_s, NULL); d->player_list.players[i].score += card_stack_get_points(&d->table_stacks.stacks[d->stack_index]); - card_stack_clear(&d->table_stacks.stacks[d->stack_index], c); + card_stack_replace(&d->table_stacks.stacks[d->stack_index], c); } else // card fits on a stack -> place it { @@ -104,7 +103,7 @@ game_state_t state_server_play_cards(const socket_list_t *client_socks, const ma if(cs->cards[MAX_CARD_STACK_SIZE-1] != 0) // stack is full { d->player_list.players[i].score += card_stack_get_points(cs); - card_stack_clear(cs, c); + card_stack_replace(cs, c); } else { |