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

Merge remote-tracking branch 'AZMCODE/tty-solitaire/auto-win-disable'

Browse Source
This commit is contained in:
maride 2024-11-26 22:25:01 +01:00
commit 2024d53e48
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game.c
View File

@ -200,7 +200,7 @@ static void deal_cards(struct deck *deck) {
}
void game_init(struct game *game, int passes_through_deck,
int four_color_deck) {
int four_color_deck, int auto_win_disable) {
cursor_malloc(&cursor);
cursor_init(cursor);
deck_malloc(&deck);
@ -220,6 +220,7 @@ void game_init(struct game *game, int passes_through_deck,
}
game->four_color_deck = four_color_deck;
game->auto_win_disable = auto_win_disable;
fill_deck(deck);
shuffle_deck(deck);
@ -236,7 +237,13 @@ void game_end() {
deck_free(deck);
}
bool game_won() {
bool game_won(int auto_win_disable) {
if (auto_win_disable) {
return(stack_length(deck->foundation[0]) == 13 &&
stack_length(deck->foundation[1]) == 13 &&
stack_length(deck->foundation[2]) == 13 &&
stack_length(deck->foundation[3]) == 13);
} else {
// If any card in the maneuvre stacks is covered, game is not won.
for (int i = 0; i < MANEUVRE_STACKS_NUMBER; i++) {
for (struct stack *j = deck->maneuvre[i]; j != NULL; j = j->next) {
@ -252,4 +259,5 @@ bool game_won() {
}
return (true);
}
}

3
src/game.h
View File

@ -33,6 +33,7 @@
struct game {
int passes_through_deck_left;
int four_color_deck;
int auto_win_disable;
};
extern struct deck *deck;
@ -44,7 +45,7 @@ bool valid_move(struct stack *, struct stack *);
void move_card(struct stack **, struct stack **);
void move_block(struct stack **, struct stack **, int);
void expose_top(struct stack **);
void game_init(struct game *, int, int);
void game_init(struct game *, int, int, int);
bool game_won();
void game_end();

8
src/ttysolitaire.c
View File

@ -26,12 +26,14 @@ int main(int argc, char *argv[]) {
int passes_through_deck = 3;
static int four_color_deck;
static int no_background_color;
static int auto_win_disable;
static const struct option options[] = {
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'v'},
{"passes", required_argument, NULL, 'p'},
{"four-color-deck", no_argument, &four_color_deck, 1},
{"no-background-color", no_argument, &no_background_color, 1},
{"auto-win-disable", no_argument, &auto_win_disable, 1},
{0, 0, 0, 0}};
program_name = basename(argv[0]);
@ -108,7 +110,7 @@ int main(int argc, char *argv[]) {
if (key == KEY_SPACEBAR) {
clear();
refresh();
game_init(&game, passes_through_deck, four_color_deck);
game_init(&game, passes_through_deck, four_color_deck, auto_win_disable);
break;
}
} else if (key == KEY_RESIZE) {
@ -120,7 +122,7 @@ int main(int argc, char *argv[]) {
do {
keyboard_event(getch());
} while (!game_won());
} while (!game_won(game.auto_win_disable));
endwin();
game_end();
@ -148,6 +150,8 @@ void usage(const char *program_name) {
"(default: false)\n");
printf(" --no-background-color Don't draw background color "
"(default: false)\n");
printf(" --auto-win-disable Disable auto-winning the game "
"(default: false)\n");
}
void version() { printf("%s\n", VERSION); }