From 52f95177eb8050f073a3d65413feb16cfce93baa Mon Sep 17 00:00:00 2001 From: Mario Kilies Date: Tue, 25 Jan 2011 13:14:17 +0100 Subject: Removed awkward pnoc_t and refactored its contents to the new player_list_entry_t. --- src/net/server.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/net/server.c') diff --git a/src/net/server.c b/src/net/server.c index d05d7a9..faad773 100644 --- a/src/net/server.c +++ b/src/net/server.c @@ -115,12 +115,12 @@ bool server_parse_hello(const msg_t *m) data_store* ds = datamodel(); - for(int i=0; iplayers.count; i++) + for(int i=0; iplayer_list.count; i++) { - if(strlen(ds->players.players[i].player_name) > 0) // search for first empty (not yet assigned) slot + if(strlen(ds->player_list.players[i].player_name) > 0) // search for first empty (not yet assigned) slot continue; - memcpy(ds->players.players[i].player_name, m->payload, m->hdr.payload_length); - ds->players.players[i].player_name[m->hdr.payload_length] = '\0'; + memcpy(ds->player_list.players[i].player_name, m->payload, m->hdr.payload_length); + ds->player_list.players[i].player_name[m->hdr.payload_length] = '\0'; } return true; @@ -152,20 +152,20 @@ uint8_t* server_parse_selected_stack(const msg_t *m) void server_prep_start_game(msg_t *m) { uint16_t pos = 0; - data_store* ds = datamodel(); - player_list* players = &ds->players; + data_store *ds = datamodel(); + player_list_t *player_list = &ds->player_list; m->hdr.type = msg_type_start_game; - m->payload[pos++] = players->count; + m->payload[pos++] = player_list->count; // copy player_ids, length and nicknames to message payload - for(int i=0; icount; i++) + for(int i = 0; i < player_list->count; i++) { - pnoc_t* pl = &players->players[i]; - m->payload[pos++] = pl->player_id; - uint8_t len = strlen(pl->player_name); + player_list_entry_t *ple = &player_list->players[i]; + m->payload[pos++] = ple->player_id; + uint8_t len = strlen(ple->player_name); m->payload[pos++] = len; - memcpy(m->payload+pos, pl->player_name, len); + memcpy(m->payload+pos, ple->player_name, len); pos += len; } @@ -213,13 +213,13 @@ void server_prep_selected_card_all(msg_t *m) m->hdr.type = msg_type_selected_card_all; - for(int i=0; iplayers.count; i++) + for(int i = 0; i < ds->player_list.count; i++) { - pnoc_t* pnoc = &ds->players.players[i]; - if(pnoc->player_id == 0) // invalid player + player_list_entry_t *ple = &ds->player_list.players[i]; + if(ple->player_id == 0) // invalid player continue; - m->payload[pos++] = pnoc->player_id; - m->payload[pos++] = pnoc->open_card; + m->payload[pos++] = ple->player_id; + m->payload[pos++] = ple->open_card; } m->hdr.payload_length = pos; -- cgit v1.2.3