diff options
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/net.h | 2 | ||||
| -rw-r--r-- | src/net_client.c | 6 | ||||
| -rw-r--r-- | src/net_server.c | 2 | ||||
| -rw-r--r-- | src/player.h | 4 |
5 files changed, 9 insertions, 9 deletions
@@ -21,7 +21,7 @@ int main(int argc, char **argv) { int ssock; int* csocks; - struct player_list players; + player_list players; int opponents = 3; const char* nickname = "deki"; const hand testhand = { 12, 23, 35, 42, 55, 57, 70, 81, 103, 0 }; @@ -62,7 +62,7 @@ int main(int argc, char **argv) else if (argc == 3) // Client mode { int sock; - struct player_list* players; + player_list* players; const char* nickname = "schnippi"; hand* testhand; addr = argv[1]; @@ -41,7 +41,7 @@ typedef struct // Server side functions int server_start(const char* port); int* server_get_players(int serversock, const uint8_t count); -void server_start_game(int* clients, const uint8_t clientcount, const struct player_list* players); +void server_start_game(int* clients, const uint8_t clientcount, const player_list* players); void server_deal_cards(int sock, const hand h); void* server_recv(int sock, uint8_t wanted); diff --git a/src/net_client.c b/src/net_client.c index d0149b4..9aff39f 100644 --- a/src/net_client.c +++ b/src/net_client.c @@ -83,17 +83,17 @@ int client_connect_server(const char* host, const char* port) return sock; } -static struct player_list* client_recv_player_list(int sock, uint8_t data_len) +static player_list* client_recv_player_list(int sock, uint8_t data_len) { uint8_t buf[data_len]; - struct player_list* players; + player_list* players; uint32_t pos; recv(sock, buf, data_len, 0); assert(buf[INDEX_TYPE] == msg_type_start_game); - players = malloc(sizeof(struct player_list)); + players = malloc(sizeof(player_list)); if(players == NULL) { printf("client_recv_player_list: Out of memory\n"); diff --git a/src/net_server.c b/src/net_server.c index bc64024..edafed2 100644 --- a/src/net_server.c +++ b/src/net_server.c @@ -117,7 +117,7 @@ int* server_get_players(int serversock, const uint8_t count) * @param[in] clientcount Number of clients * @param[in] players List of all players (including self) to send */ -void server_start_game(int* clients, const uint8_t clientcount, const struct player_list* players) +void server_start_game(int* clients, const uint8_t clientcount, const player_list* players) { uint8_t* buf; uint8_t usercount = players->count; diff --git a/src/player.h b/src/player.h index 80f8df9..1438aa0 100644 --- a/src/player.h +++ b/src/player.h @@ -6,10 +6,10 @@ #include <stdint.h> -struct player_list +typedef struct { uint8_t count; char* names[MAX_PLAYERS]; -}; +} player_list; #endif // OXEN_PLAYER_H |