From b4b784928cbec4a93c71f3ca1e37a14397929edb Mon Sep 17 00:00:00 2001 From: scratko Date: Sun, 18 Aug 2024 22:24:30 +0300 Subject: Final version v1.0 Fixed stack clearing. Added check for NULL before clearing game parameters. Added refactoring of define_phase_after_attack(). Analyzing game results is organized into several functions. Fixed card limit detection on tossing (line 366 in server_data_processing.c). --- server/server_data_processing.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'server/server_data_processing.c') diff --git a/server/server_data_processing.c b/server/server_data_processing.c index 99ac579..41e4b08 100644 --- a/server/server_data_processing.c +++ b/server/server_data_processing.c @@ -291,7 +291,7 @@ int get_card_from_defender(struct session *client, struct cards_on_table *cot, for(i = 0; i < read_result && client->buffer[i] != '\n'; ++i) given_card[i] = client->buffer[i]; given_card[i] = '\0'; - if(is_card_bit(cot->card_arr[cot->card_arr_idx-2], given_card, trump_suit)){ + if(is_card_beat(cot->card_arr[cot->card_arr_idx-2], given_card, trump_suit)){ stack_card = remove_card_from_stack(&client->deck, given_card); put_defender_card_on_table(cot, stack_card); return 1; @@ -363,10 +363,10 @@ int get_cards_from_tossing_player(struct session *client, data_length = sprintf(output_buffer, "%d:%s\n", card_acceptance_status, all_cards_received_status ? "all" : "not all"); write_to_client(client->fd, data_length); - if(all_cards_received_status) + if(!card_return_status) return answer_got; else - return anwer_got_with_limit; + return answer_got_with_limit; } void print_game_result(const struct session *client, int durak_position) -- cgit v1.2.3