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

Moved functions to the cursor module.

Browse Source
This commit is contained in:
Murilo Pereira 2011-06-06 22:19:08 -03:00
parent 6588525e8e
commit cba0615b24
3 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/cursor.c
View File

@ -112,3 +112,43 @@ enum movement cursor_direction(int key) {
assert(false && "invalid cursor direction");
}
}
struct stack **cursor_stack(struct cursor *cursor) {
if (cursor->y == CURSOR_BEGIN_Y) {
switch (cursor->x) {
case CURSOR_STOCK_X: return(&(deck->stock));
case CURSOR_WASTE_PILE_X: return(&(deck->waste_pile));
case CURSOR_FOUNDATION_0_X: return(&(deck->foundation[0]));
case CURSOR_FOUNDATION_1_X: return(&(deck->foundation[1]));
case CURSOR_FOUNDATION_2_X: return(&(deck->foundation[2]));
case CURSOR_FOUNDATION_3_X: return(&(deck->foundation[3]));
case CURSOR_INVALID_SPOT_X: return(NULL);
default:
endwin();
game_end();
assert(false && "invalid stack");
}
} else {
switch (cursor->x) {
case CURSOR_MANEUVRE_0_X: return(&(deck->maneuvre[0]));
case CURSOR_MANEUVRE_1_X: return(&(deck->maneuvre[1]));
case CURSOR_MANEUVRE_2_X: return(&(deck->maneuvre[2]));
case CURSOR_MANEUVRE_3_X: return(&(deck->maneuvre[3]));
case CURSOR_MANEUVRE_4_X: return(&(deck->maneuvre[4]));
case CURSOR_MANEUVRE_5_X: return(&(deck->maneuvre[5]));
case CURSOR_MANEUVRE_6_X: return(&(deck->maneuvre[6]));
default:
endwin();
game_end();
assert(false && "invalid stack");
}
}
}
bool cursor_on_stock(struct cursor *cursor) {
return(cursor_stack(cursor) && *cursor_stack(cursor) == deck->stock);
}
bool cursor_on_invalid_spot(struct cursor *cursor) {
return(!cursor_stack(cursor));
}

3
src/cursor.h
View File

@ -42,5 +42,8 @@ void cursor_mark(struct cursor *);
void cursor_unmark(struct cursor *);
void cursor_move(struct cursor *, enum movement);
enum movement cursor_direction(int);
struct stack **cursor_stack(struct cursor *);
bool cursor_on_stock(struct cursor *);
bool cursor_on_invalid_spot(struct cursor *);
#endif

60
src/keyboard.c
View File

@ -8,56 +8,6 @@
#include "cursor.h"
#include "draw.h"
static struct stack **cursor_stack(struct cursor *cursor) {
if (cursor->y == CURSOR_BEGIN_Y) {
switch (cursor->x) {
case CURSOR_STOCK_X: return(&(deck->stock));
case CURSOR_WASTE_PILE_X: return(&(deck->waste_pile));
case CURSOR_FOUNDATION_0_X: return(&(deck->foundation[0]));
case CURSOR_FOUNDATION_1_X: return(&(deck->foundation[1]));
case CURSOR_FOUNDATION_2_X: return(&(deck->foundation[2]));
case CURSOR_FOUNDATION_3_X: return(&(deck->foundation[3]));
case CURSOR_INVALID_SPOT_X: return(NULL);
default:
endwin();
game_end();
assert(false && "invalid stack");
}
} else {
switch (cursor->x) {
case CURSOR_MANEUVRE_0_X: return(&(deck->maneuvre[0]));
case CURSOR_MANEUVRE_1_X: return(&(deck->maneuvre[1]));
case CURSOR_MANEUVRE_2_X: return(&(deck->maneuvre[2]));
case CURSOR_MANEUVRE_3_X: return(&(deck->maneuvre[3]));
case CURSOR_MANEUVRE_4_X: return(&(deck->maneuvre[4]));
case CURSOR_MANEUVRE_5_X: return(&(deck->maneuvre[5]));
case CURSOR_MANEUVRE_6_X: return(&(deck->maneuvre[6]));
default:
endwin();
game_end();
assert(false && "invalid stack");
}
}
}
static bool cursor_on_stock(struct cursor *cursor) {
return(cursor_stack(cursor) && *cursor_stack(cursor) == deck->stock);
}
static bool cursor_on_invalid_spot(struct cursor *cursor) {
return(!cursor_stack(cursor));
}
static void handle_stock_event() {
if (!stack_empty(deck->stock)) {
move_card(&(deck->stock), &(deck->waste_pile));
card_expose(deck->waste_pile->card);
erase_stack(deck->waste_pile);
draw_stack(deck->stock);
draw_stack(deck->waste_pile);
}
}
/* FIXME: this function does not work on stacks with no marked cards.
* In that case it returns the stack's length. */
static int marked_cards_count(struct stack *stack) {
@ -83,6 +33,16 @@ static void unmark_cards(struct stack *stack) {
}
}
static void handle_stock_event() {
if (!stack_empty(deck->stock)) {
move_card(&(deck->stock), &(deck->waste_pile));
card_expose(deck->waste_pile->card);
erase_stack(deck->waste_pile);
draw_stack(deck->stock);
draw_stack(deck->waste_pile);
}
}
static void handle_card_movement(struct cursor *cursor) {
struct stack **origin = cursor_stack(cursor);
struct stack **destination;