maride/tty-solitaire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Encapsulated function to move blocks and removed compiler warnings.

Browse Source
This commit is contained in:
Murilo Pereira 2011-06-05 23:08:08 -03:00
parent 656f8e6190
commit 4d3892101d
4 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/card.h
View File

@ -36,5 +36,7 @@ void set_card(struct card *, enum value, enum suit, enum face, int, int);
void expose_card(struct card *);
void cover_card(struct card *);
struct card *duplicate_card(struct card *);
void mark_card(struct card *);
void unmark_card(struct card *);
#endif

17
src/game.c
View File

@ -113,6 +113,23 @@ void move_card(struct stack **origin, struct stack **destination) {
}
}
void move_block(struct stack **origin, struct stack **destination, int block_size) {
struct stack *tmp;
allocate_stack(&tmp);
initialize_stack(tmp);
for (int i = 0; i < block_size; i++) {
push(&tmp, pop(origin));
}
for (int i = 0; i < block_size; i++) {
move_card(&tmp, destination);
}
if (length(*destination) > 1) {
cursor->y += block_size;
}
free_stack(tmp);
}
static void fill_deck(struct deck *deck) {
struct card *card[NUMBER_OF_CARDS];

2
src/game.h
View File

@ -34,7 +34,7 @@ struct cursor *cursor;
bool maneuvre_stack(struct stack *);
bool valid_move(struct stack *, struct stack *);
void move_card(struct stack **, struct stack **);
void greet_player();
void move_block(struct stack **, struct stack **, int);
void game_init();
void game_end();

40
src/keyboard.c
View File

@ -77,8 +77,8 @@ static int marked_cards_count(struct stack *stack) {
}
static void unmark_cards(struct stack *stack) {
int marked_cards = marked_cards_count(stack);
for (int i = 0; i < marked_cards; stack = stack->next, i++) {
int _marked_cards_count = marked_cards_count(stack);
for (int i = 0; i < _marked_cards_count; stack = stack->next, i++) {
unmark_card(stack->card);
}
}
@ -164,50 +164,34 @@ static void handle_card_movement(struct cursor *cursor) {
break;
case KEY_SPACEBAR:
destination = cursor_stack(cursor);
int marked_cards = marked_cards_count(*origin);
if (maneuvre_stack(*origin) && marked_cards > 0) {
int _marked_cards_count = marked_cards_count(*origin);
if (maneuvre_stack(*origin) && _marked_cards_count > 0) {
erase_stack(*origin);
unmark_cards(*origin);
draw_stack(*origin);
}
if (destination) {
if (marked_cards > 1 &&
erase_stack(*origin);
erase_cursor(cursor);
if (_marked_cards_count > 1 &&
maneuvre_stack(*origin) &&
maneuvre_stack(*destination)) {
struct stack *block = *origin;
for (int i = 1; i < marked_cards; block = block->next, i++)
for (int i = 1; i < _marked_cards_count; block = block->next, i++)
;
if (valid_move(block, *destination)) {
erase_stack(*origin);
struct stack *tmp;
allocate_stack(&tmp);
initialize_stack(tmp);
for (int i = 0; i < marked_cards; i++) {
push(&tmp, pop(origin));
}
for (int i = 0; i < marked_cards; i++) {
move_card(&tmp, destination);
}
if (length(*destination) > 1) {
erase_cursor(cursor);
cursor->y += marked_cards;
}
free_stack(tmp);
draw_stack(*origin);
draw_stack(*destination);
move_block(origin, destination, _marked_cards_count);
}
} else {
if (valid_move(*origin, *destination)) {
erase_stack(*origin);
move_card(origin, destination);
if (maneuvre_stack(*destination) && length(*destination) > 1) {
erase_cursor(cursor);
cursor->y++;
}
draw_stack(*origin);
draw_stack(*destination);
move_card(origin, destination);
}
}
draw_stack(*origin);
draw_stack(*destination);
if (maneuvre_stack(*origin) && *origin == *destination) {
erase_cursor(cursor);
cursor->y--;