From 4d26111501a131173857a20eb7050bc1b5f8e04a Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Tue, 25 Jan 2011 00:04:31 +0100 Subject: little cleanup; enable interrupts (ctrl-c) --- src/game.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) (limited to 'src/game.c') diff --git a/src/game.c b/src/game.c index 2cb01d8..845f826 100644 --- a/src/game.c +++ b/src/game.c @@ -106,9 +106,10 @@ static void main_loop_client(int sock) ui_display_wnd_current_state(data->players.players, data->players.count, 0, 0); // TODO fix parameters - state = STATE_CLIENT_PLAY_CARDS; - sleep(2); - return; + //state = STATE_CLIENT_PLAY_CARDS; + //sleep(2); + //return; + state = STATE_CLIENT_SELECT_OPEN_CARD;; // just for testing break; #if 0 @@ -229,8 +230,8 @@ static void main_loop_server(socket_list_t* client_socks) for(int i=0; iplayers.count; i++) net_send(client_socks->sockets[i], msg_type_selected_card_all, NULL); - state = STATE_SERVER_PLAY_CARDS; - return; + //state = STATE_SERVER_PLAY_CARDS; + state = STATE_SERVER_WAIT_FOR_OPEN_CARDS; // just for testing break; #if 0 case STATE_SERVER_PLAY_CARDS: @@ -297,28 +298,10 @@ 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; data_store* data = datamodel(); - // The stack points window uses ts, too, so there is no separate data set - - // Example data set for current state window - pnoc_t pnoc[10] = { - {0, "$you", 10}, - {1, "1234567890", 23}, - {2, "baz", 38}, - {3, "foo_bar", 14}, - {4, "lolcat", 60}, - {5, "blablub123", 15}, - {6, "abcdefg", 103}, - {7, "hello", 98}, - {8, "hornoxe", 33}, - {9, "1337nick", 74} - }; - pnoc_sort(pnoc, 10); - const uint32_t score = 10; - server_sock = server_start(port); server_get_players(server_sock, &client_socks, num_players); data->players.count = num_players; -- cgit v1.2.3