summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Kilies <MarioKilies@GMX.net>2011-01-29 18:12:11 +0100
committerMario Kilies <MarioKilies@GMX.net>2011-01-29 18:12:11 +0100
commit82b730d941df3ab0e7718435dd047900b26e633a (patch)
treebf7e486c7ac26abf8a1355d8195373b451fae4e2
parentab80fa342031a548b549e4581cb946982b433c3a (diff)
Some minor changes: Removed some debug output; Switched from usleep() to sleep() for delaying connections to server.
-rw-r--r--src/client_game_states.c2
-rw-r--r--src/game.c3
-rw-r--r--src/main.c5
-rw-r--r--src/net/server.c5
4 files changed, 11 insertions, 4 deletions
diff --git a/src/client_game_states.c b/src/client_game_states.c
index a60fc52..4786ae9 100644
--- a/src/client_game_states.c
+++ b/src/client_game_states.c
@@ -97,7 +97,7 @@ game_state_t state_client_play_cards(const int sock)
uint8_t stack_idx = get_stack_idx_for_card(&ds->table_stacks, c);
bool our_turn = (ds->player_list.players[i].player_id == ds->own_player_id);
- ui_display_wnd_messages("Placing cards...", false);
+ ui_display_wnd_messages("Placing cards ...", false);
ui_display_wnd_current_state(&ds->player_list, ds->player_list.count, true, i, ple->score);
ui_update();
diff --git a/src/game.c b/src/game.c
index e3eeff5..203d2fe 100644
--- a/src/game.c
+++ b/src/game.c
@@ -146,7 +146,6 @@ void start_game(const bool servermode, const char* addr, const char* port, const
client_socks.player_ids[i] = i+1;
data->player_list.players[i].player_id = i+1;
net_send(client_socks.sockets[i], msg_type_hello_s, &data->player_list.players[i]);
- printf("Player connected: %s\n", data->player_list.players[i].player_name);
}
for(int i = 0; i < num_players; i++)
@@ -168,7 +167,7 @@ void start_game(const bool servermode, const char* addr, const char* port, const
sock = client_connect_server(addr, port);
if(sock != -1)
break;
- usleep(300000); // wait 300 ms before retry
+ sleep(1); // wait one second before retry
}
if(sock == -1)
{
diff --git a/src/main.c b/src/main.c
index 1828e60..4d38094 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,6 +26,11 @@ static void print_usage(const char* name)
exit(EXIT_FAILURE);
}
+/**
+ * The application's entry point.
+ * @param[in] argc The number of arguments passed
+ * @param[in] argv The array of passed arguments
+*/
int main(int argc, char *argv[])
{
int opt;
diff --git a/src/net/server.c b/src/net/server.c
index cc6c438..27fbd14 100644
--- a/src/net/server.c
+++ b/src/net/server.c
@@ -104,6 +104,8 @@ void server_get_players(int serversock, socket_list_t* client_socks, const uint8
assert(count <= MAX_PLAYERS && count > 0);
+ printf("Waiting for %d players to connect ...\n", count);
+
// accept connections
for(i=0; i<count; i++)
{
@@ -116,9 +118,10 @@ void server_get_players(int serversock, socket_list_t* client_socks, const uint8
exit(EXIT_FAILURE);
}
//printf("new client connected: %s\n", inet_ntop(sock.ss_family, get_in_addr((struct sockaddr*)&sock), INET6_ADDRSTRLEN));
- printf("new client connected (%d/%d)\n", i+1, count);
}
client_socks->count = count;
+
+ printf("All players connected. Starting game!\n");
}
/**