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

Do not segfault when moving from/to the invalid spot.

Browse Source
This commit is contained in:
Murilo Pereira 2011-06-01 01:08:32 -03:00
parent 7c28c40ec3
commit 69d3647dae
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/keyboard.c
View File

@ -1,16 +1,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "card.h"
#include "game.h" #include "game.h"
#include "display.h" #include "display.h"
#include "curses.h" #include "curses.h"
#include "keyboard.h" #include "keyboard.h"
static bool cursor_on_stock(struct cursor *cursor) {
return((cursor->x == CURSOR_BEGIN_X) && (cursor->y == CURSOR_BEGIN_Y));
}
static struct stack **cursor_stack(struct cursor *cursor) { static struct stack **cursor_stack(struct cursor *cursor) {
if (cursor->y == CURSOR_BEGIN_Y) { if (cursor->y == CURSOR_BEGIN_Y) {
switch (cursor->x) { switch (cursor->x) {
@ -20,7 +15,11 @@ static struct stack **cursor_stack(struct cursor *cursor) {
case CURSOR_FOUNDATION_1_X: return(&(deck->foundation[1])); case CURSOR_FOUNDATION_1_X: return(&(deck->foundation[1]));
case CURSOR_FOUNDATION_2_X: return(&(deck->foundation[2])); case CURSOR_FOUNDATION_2_X: return(&(deck->foundation[2]));
case CURSOR_FOUNDATION_3_X: return(&(deck->foundation[3])); case CURSOR_FOUNDATION_3_X: return(&(deck->foundation[3]));
default: assert(false && "invalid stack"); case CURSOR_INVALID_SPOT_X: return(NULL);
default:
end_curses();
end_game();
assert(false && "invalid stack");
} }
} else { } else {
switch (cursor->x) { switch (cursor->x) {
@ -31,14 +30,20 @@ static struct stack **cursor_stack(struct cursor *cursor) {
case CURSOR_MANEUVRE_4_X: return(&(deck->maneuvre[4])); case CURSOR_MANEUVRE_4_X: return(&(deck->maneuvre[4]));
case CURSOR_MANEUVRE_5_X: return(&(deck->maneuvre[5])); case CURSOR_MANEUVRE_5_X: return(&(deck->maneuvre[5]));
case CURSOR_MANEUVRE_6_X: return(&(deck->maneuvre[6])); case CURSOR_MANEUVRE_6_X: return(&(deck->maneuvre[6]));
default: assert(false && "invalid stack"); default:
end_curses();
end_game();
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) { static bool cursor_on_invalid_spot(struct cursor *cursor) {
return(cursor->x == CURSOR_INVALID_SPOT_X && return(!cursor_stack(cursor));
cursor->y == CURSOR_INVALID_SPOT_Y);
} }
static void handle_stock_event() { static void handle_stock_event() {
@ -96,7 +101,7 @@ static void handle_card_movement(struct cursor *cursor) {
break; break;
case KEY_SPACEBAR: case KEY_SPACEBAR:
destination = cursor_stack(cursor); destination = cursor_stack(cursor);
if (valid_move(*origin, *destination)) { if (destination && valid_move(*origin, *destination)) {
erase_stack(*origin); erase_stack(*origin);
move_card(origin, destination); move_card(origin, destination);
draw_stack(*origin); draw_stack(*origin);