Merge branch 'master' of ssh://icarus-git/~git/oxen

1 files changed, 3 insertions, 12 deletions

diff --git a/src/client_game_states.c b/src/client_game_states.c
index 4fa4266..686acb6 100644
--- a/src/client_game_states.c
+++ b/src/client_game_states.c
@@ -80,7 +80,7 @@ game_state_t state_client_play_cards(const int sock)
 
 			net_recv(sock, msg_type_selected_stack_s);
 			ds->player_list.players[i].score += card_stack_get_points(&ds->table_stacks.stacks[ds->stack_index]);
-			card_stack_clear(&ds->table_stacks.stacks[ds->stack_index], c);
+			card_stack_replace(&ds->table_stacks.stacks[ds->stack_index], c);
 		}
 		else // card fits on a stack -> place it
 		{
@@ -88,19 +88,10 @@ game_state_t state_client_play_cards(const int sock)
 			if(cs->cards[MAX_CARD_STACK_SIZE-1] != 0) // stack is full
 			{
 				ds->player_list.players[i].score += card_stack_get_points(cs);
-				card_stack_clear(cs, c);
+				card_stack_replace(cs, c);
 			}
 			else
-			{
-				// put open card on top of stack
-				for(int j=0; j<MAX_CARD_STACK_SIZE; j++)
-				{
-					if(cs->cards[j] != 0)
-						continue;
-					cs->cards[j] = c;
-					break;
-				}
-			}
+				card_stack_push(cs, c);
 		}
 	}