From e8cf7b92a0516ea6dbea9a4e4c53710be46d1539 Mon Sep 17 00:00:00 2001 From: Murilo Pereira Date: Wed, 9 Feb 2011 23:51:07 -0200 Subject: [PATCH] This is better here. --- lib/stack.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/stack.c b/lib/stack.c index 7940a45..fd89986 100644 --- a/lib/stack.c +++ b/lib/stack.c @@ -10,16 +10,6 @@ static bool maneuvre_stack(struct stack *stack) { return(stack->card->frame->start_y >= MANEUVRE_STACKS_STARTING_Y); } -static void refresh_card_coordinates(struct stack *origin, struct stack *destination) { - origin->card->frame->start_x = destination->card->frame->start_x; - origin->card->frame->start_y = destination->card->frame->start_y; - if (!empty(destination) && maneuvre_stack(destination)) { - origin->card->frame->start_y++; - } - - return; -} - void allocate_stack(struct stack **stack) { if (!(*stack = malloc(sizeof(**stack)))) { fprintf(stderr, "%s: %s (%s:%d)\n", program_name, strerror(errno), __FILE__, __LINE__ - 1); @@ -102,7 +92,11 @@ struct stack *pop(struct stack **stack) { void move_card(struct stack **origin, struct stack **destination) { struct stack *stack = NULL; - refresh_card_coordinates(*origin, *destination); + (*origin)->card->frame->start_x = (*destination)->card->frame->start_x; + (*origin)->card->frame->start_y = (*destination)->card->frame->start_y; + if (!empty(*destination) && maneuvre_stack(*destination)) { + (*origin)->card->frame->start_y++; + } stack = pop(origin); push(destination, stack->card);