Removed awkward pnoc_t and refactored its contents to the new player_list_entry_t.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/net/client.c b/src/net/client.c
index 73d889a..7f1f98a 100644
--- a/src/net/client.c
+++ b/src/net/client.c
@@ -69,17 +69,17 @@ bool client_parse_player_list(const msg_t *m)
 	data_store* ds = datamodel();
 	uint32_t pos = 0;
 
-	ds->players.count = m->payload[pos++];
+	ds->player_list.count = m->payload[pos++];
 
 	// read usernames from buffer
-	for(int i=0; i<ds->players.count; i++)
+	for(int i=0; i<ds->player_list.count; i++)
 	{
 		uint8_t namelen;
-		ds->players.players[i].player_id = m->payload[pos++];
+		ds->player_list.players[i].player_id = m->payload[pos++];
 		namelen = m->payload[pos++];
 		assert(namelen <= MAX_PLAYER_NAME_LENGTH);
-		strncpy(ds->players.players[i].player_name, (const char*) m->payload+pos, namelen);
-		ds->players.players[i].player_name[namelen] = '\0';
+		strncpy(ds->player_list.players[i].player_name, (const char*) m->payload+pos, namelen);
+		ds->player_list.players[i].player_name[namelen] = '\0';
 		pos += namelen;
 	}
 
@@ -132,9 +132,9 @@ bool client_parse_selected_card_all(const msg_t *m)
 	data_store* ds = datamodel();
 	for(int i=0; i<m->hdr.payload_length; i+=2)
 	{
-		uint8_t pid = m->payload[i];
-		pnoc_t* pnoc = get_pnoc_from_playerid(&ds->players, pid);
-		pnoc->open_card = m->payload[i+1];
+		player_id_t pid = m->payload[i];
+		player_list_entry_t *ple = get_player_list_entry_by_player_id(&ds->player_list, pid);
+		ple->open_card = m->payload[i+1];
 	}
 
 	return true;