1 files changed, 8 insertions, 8 deletions

diff --git a/src/server_game_states.c b/src/server_game_states.c
index c00fc26..1a86814 100644
--- a/src/server_game_states.c
+++ b/src/server_game_states.c
@@ -15,18 +15,18 @@ game_state_t state_server_deal_hand_cards(const socket_list_t *client_socks, con
 		d->table_stacks.stacks[2].cards[0] = main_stack_remove_card(m);
 		d->table_stacks.stacks[3].cards[0] = main_stack_remove_card(m);
 
-		for(int i = 0; i < d->players.count; i++)
+		for(int i = 0; i < d->player_list.count; i++)
 		{
 			net_send(client_socks->sockets[i], msg_type_initial_stacks, NULL);
 		}
 	}
 
-	int num_dealcards = main_stack_size(m) / d->players.count;
+	int num_dealcards = main_stack_size(m) / d->player_list.count;
 	if(num_dealcards > 10)
 		num_dealcards = 10;
 
 	// Deal hand cards to clients
-	for(int i = 0; i < d->players.count; i++)
+	for(int i = 0; i < d->player_list.count; i++)
 	{
 		hand_t h;
 		memset(h.cards, 0, MAX_HAND_CARDS);
@@ -47,15 +47,15 @@ game_state_t state_server_wait_for_open_cards(const socket_list_t *client_socks)
 	data_store *d = datamodel();
 
 	// Receive open cards from clients
-	for(int i = 0; i < d->players.count; i++)
+	for(int i = 0; i < d->player_list.count; i++)
 	{
-		pnoc_t* pl = get_pnoc_from_playerid(&d->players, client_socks->player_ids[i]);
-		assert(pl != NULL);
+		player_list_entry_t *ple = get_player_list_entry_by_player_id(&d->player_list, client_socks->player_ids[i]);
+		assert(ple != NULL);
 		net_recv(client_socks->sockets[i], msg_type_selected_card);
-		pl->open_card = d->selected_card;
+		ple->open_card = d->selected_card;
 	}
 
-	for(int i = 0; i < d->players.count; i++)
+	for(int i = 0; i < d->player_list.count; i++)
 		net_send(client_socks->sockets[i], msg_type_selected_card_all, NULL);
 
 	//return STATE_SERVER_PLAY_CARDS;