Global fixes v4.0

Removed unnecessary comments.
Added resource cleanup for client and server.
Changed queue display.
Added player indicator.
It's possible to quit the game while typing or waiting for a connection.
Fixed a bug with determining the limit of card tossing.

1 files changed, 0 insertions, 44 deletions

diff --git a/server/server_game_process.c b/server/server_game_process.c
index d6fc4be..369f3d6 100644
--- a/server/server_game_process.c
+++ b/server/server_game_process.c
@@ -115,19 +115,6 @@ const char* extract_trump_card(const char **shuffled_deck, int *cards_left)
     }
     return trump_card;
 }
-#if 0
-const char* find_trump_suit(const char **shuffled_deck, int *cards_left)
-{
-    const char *trump_suit = NULL;
-    trump_suit = shuffled_deck[0] ? shuffled_deck[0] : NULL;
-    if(trump_suit) {
-        shuffled_deck[0] = NULL;
-        trump_suit += strlen(trump_suit) - 1;
-        --*cards_left;
-    }
-    return trump_suit;
-}
-#endif
 
 int convert_rank_to_int(const char *card)
 {
@@ -207,16 +194,6 @@ void update_card_quantity_arr(struct session **turn_queue, struct card_count cc)
         cc.number_arr[key] =
             find_out_card_quantity_in_deck(turn_queue[i]->deck);
     }
-
-
-#if 0
-    for(i = 0; i < serv->max_sess_arr_size; ++i)
-        if(serv->sess_arr[i]) {
-            player_position_idx = serv->sess_arr[i]->player_position - 1;
-            serv->cc.number_arr[player_position_idx] =
-                find_out_card_quantity_in_deck(serv->sess_arr[i]->deck);
-        }
-#endif
 }
 
 struct game_info* get_new_game_info(int players_number, int *card_quantity_arr,
@@ -517,14 +494,7 @@ void put_defender_card_on_table(struct cards_on_table *cot, const char *card)
 void move_all_cards_to_defender(struct cards_on_table *cot, player_cards *deck)
 {
     int i;
-#if 0
-    const char *card;
 
-    while(!is_empty_queue(cq)) {
-        card = pop_card_queue(cq);
-        push_stack(deck, card);
-    }
-#endif
     for(i = cot->card_arr_idx; i >= 0; --i) {
         if(cot->card_arr[i][0] == '-' || cot->card_arr[i][0] == '\\')
             continue;
@@ -617,17 +587,3 @@ int check_everyone_can_replanish_deck(int shuffled_cards_left,
     }
     return shuffled_cards_left >= 0;
 }
-#if 0
-void find_out_who_dropped_all_cards(struct session **turn_queue,
-                                    int turn_queue_size, int *number_arr)
-{
-    int i, key, player_deck_size;
-
-    for(i = 0; i < turn_queue_size; ++i) {
-        key = turn_queue[i]->player_position - 1;
-        player_deck_size = number_arr[key];
-        if(!player_deck_size)
-            turn_queue[i]->state = discarded_cards;
-    }
-}
-#endif