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

2 files changed, 25 insertions, 25 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;
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; i<ds->players.count; i++)
+	for(int i=0; i<ds->player_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; i<players->count; 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; i<ds->players.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;