summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReiner Herrmann <reiner@reiner-h.de>2011-01-25 17:57:52 +0100
committerReiner Herrmann <reiner@reiner-h.de>2011-01-25 17:57:52 +0100
commit9cdef35633f8ac896b4e5ba4fb0b3bd81824f42c (patch)
treebba8e552ae2765dd0eef1a3a0861914cf613c9be
parent25ac261e17fa4ceebf0c42bb2d614073252e7e8f (diff)
added some debug output
-rw-r--r--src/client_game_states.c7
-rw-r--r--src/game.c2
-rw-r--r--src/server_game_states.c6
-rw-r--r--src/table_stacks.c14
4 files changed, 25 insertions, 4 deletions
diff --git a/src/client_game_states.c b/src/client_game_states.c
index f8cd86d..62867e5 100644
--- a/src/client_game_states.c
+++ b/src/client_game_states.c
@@ -52,8 +52,15 @@ game_state_t state_client_wait_for_open_cards(const int sock)
ui_display_wnd_messages("Waiting for the other players to pick their cards");
net_recv(sock, msg_type_selected_card_all);
+
+for(int i=0; i<d->player_list.count; i++)
+ fprintf(stderr, "Before sort: %d\n", d->player_list.players[i].open_card);
+
player_list_sort_by_open_card(&d->player_list, d->player_list.count); // sort in ascending order
+for(int i=0; i<d->player_list.count; i++)
+ fprintf(stderr, "After sort: %d\n", d->player_list.players[i].open_card);
+
ui_display_wnd_current_state(&d->player_list, d->player_list.count, true, 0, 0); // TODO fix parameters
return STATE_CLIENT_PLAY_CARDS;
diff --git a/src/game.c b/src/game.c
index 99e4f28..c6341a8 100644
--- a/src/game.c
+++ b/src/game.c
@@ -106,7 +106,7 @@ void start_game(const bool servermode, const char* addr, const char* port)
{
int server_sock;
socket_list_t client_socks;
- uint8_t num_players = 1;
+ uint8_t num_players = 2;
srand(time(0)); // Initialize RNG
diff --git a/src/server_game_states.c b/src/server_game_states.c
index b0fb8ff..d30ab17 100644
--- a/src/server_game_states.c
+++ b/src/server_game_states.c
@@ -1,6 +1,7 @@
#include "game_states.h"
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
#include "data_store.h"
game_state_t state_server_deal_hand_cards(const socket_list_t *client_socks, const uint8_t round, main_stack_t *m)
@@ -72,9 +73,14 @@ game_state_t state_server_wait_for_open_cards(const socket_list_t *client_socks)
break;
}
}
+for(int i=0; i<d->player_list.count; i++)
+ fprintf(stderr, "Before sort: %d\n", d->player_list.players[i].open_card);
player_list_sort_by_open_card(&d->player_list, d->player_list.count); // sort in ascending order
+for(int i=0; i<d->player_list.count; i++)
+ fprintf(stderr, "After sort: %d\n", d->player_list.players[i].open_card);
+
return STATE_SERVER_PLAY_CARDS;
}
diff --git a/src/table_stacks.c b/src/table_stacks.c
index 7f76edd..147ed7e 100644
--- a/src/table_stacks.c
+++ b/src/table_stacks.c
@@ -1,5 +1,6 @@
#include <stdlib.h>
#include <assert.h>
+#include <stdio.h>
#include "table_stacks.h"
#include "card_stack.h"
#include "card.h"
@@ -10,13 +11,20 @@ const uint8_t get_stack_idx_for_card(const table_stacks_t* stack_list, const car
assert(stack_list != NULL);
uint8_t idx = NUM_TABLE_STACKS;
- uint8_t old_diff = MAX_CARD;
+ int16_t old_diff = MAX_CARD;
+ fprintf(stderr, "selected card: %d\n", c);
for(int i=0; i<NUM_TABLE_STACKS; i++)
{
card stackcard = card_stack_top(&stack_list->stacks[i]);
- uint8_t new_diff = c - stackcard;
- assert(new_diff != 0);
+ int16_t new_diff = c - stackcard;
+ fprintf(stderr, "card on top of stack %d: %d\n", i, stackcard);
+ if(new_diff == 0)
+ {
+ fprintf(stderr, "assertion failed: new_diff != 0\n");
+ exit(EXIT_FAILURE);
+ }
+ //assert(new_diff != 0);
if(new_diff < 0) // open card smaller than card on current stack
continue;