tanner/2048-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed "game over" message not appearing

Browse Source
This commit is contained in:
Aaron Bulmahn 2014-04-17 22:13:35 +02:00
parent 267678ed02
commit 99c159c982
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
2048_curses.c
View File

@ -207,13 +207,13 @@ void save_score() {
} }
} }
/* returns if there are any available spaces left on the grid */ /* returns if there are any possible moves */
int space_left() int moves_available()
{ {
int i, j; int i, j;
for (i = 0; i < SZ; i++) for (i = 0; i < SZ; i++)
for (j = 0; j < SZ; j++) for (j = 0; j < SZ; j++)
if (!g[i][j]) if (!g[i][j] || ((i + 1 < SZ) && (g[i][j] == g[i + 1][j])) || ((j + 1 < SZ) && (g[i][j] == g[i][j + 1])))
return 1; return 1;
return 0; return 0;
} }
@ -222,19 +222,10 @@ int space_left()
/* could do this in a much smarter fashion by finding which spaces are free */ /* could do this in a much smarter fashion by finding which spaces are free */
void rand_block() void rand_block()
{ {
if (space_left()) {
int x_p, y_p; int x_p, y_p;
while (g[x_p = rand() % SZ][y_p = rand() % SZ]); while (g[x_p = rand() % SZ][y_p = rand() % SZ]);
g[x_p][y_p] = (rand() & 3) ? 2 : 4; g[x_p][y_p] = (rand() & 3) ? 2 : 4;
} }
else {
endwin();
printf("\n"
"YOU LOSE! - Your score was %d\n", s);
save_score();
exit(EXIT_SUCCESS);
}
}
/* quick floor log2(n) */ /* quick floor log2(n) */
int flog2(int n) int flog2(int n)
@ -406,6 +397,14 @@ int main(int argc, char **argv)
goto retry; goto retry;
} }
if (!moves_available()) {
endwin();
printf("\n"
"YOU LOSE! - Your score was %d\n", s);
save_score();
exit(EXIT_SUCCESS);
}
if (moved) { if (moved) {
ITER(n_blocks, rand_block()); ITER(n_blocks, rand_block());
draw_grid(gamewin); draw_grid(gamewin);

22
2048_no_curses.c
View File

@ -206,13 +206,13 @@ void save_score() {
} }
} }
/* returns if there are any available spaces left on the grid */ /* returns if there are any possible moves */
int space_left() int moves_available()
{ {
int i, j; int i, j;
for (i = 0; i < SZ; i++) for (i = 0; i < SZ; i++)
for (j = 0; j < SZ; j++) for (j = 0; j < SZ; j++)
if (!g[i][j]) if (!g[i][j] || ((i + 1 < SZ) && (g[i][j] == g[i + 1][j])) || ((j + 1 < SZ) && (g[i][j] == g[i][j + 1])))
return 1; return 1;
return 0; return 0;
} }
@ -221,19 +221,10 @@ int space_left()
/* do this in a smarter fashion */ /* do this in a smarter fashion */
void rand_block() void rand_block()
{ {
if (space_left()) {
int x_p, y_p; int x_p, y_p;
while (g[x_p = rand() % SZ][y_p = rand() % SZ]); while (g[x_p = rand() % SZ][y_p = rand() % SZ]);
g[x_p][y_p] = (rand() & 3) ? 2 : 4; g[x_p][y_p] = (rand() & 3) ? 2 : 4;
} }
else {
printf("\n"
"YOU LOSE\n"
"Your score was %d\n", s);
save_score();
exit(EXIT_SUCCESS);
}
}
/* draws the grid and fills it with the current values */ /* draws the grid and fills it with the current values */
void draw_grid() void draw_grid()
@ -371,6 +362,13 @@ int main(int argc, char **argv)
goto retry; goto retry;
} }
if (!moves_available()) {
printf("\n"
"YOU LOSE! - Your score was %d\n", s);
save_score();
exit(EXIT_SUCCESS);
}
if (moved) { if (moved) {
ITER(n_blocks, rand_block()); ITER(n_blocks, rand_block());
draw_grid(); draw_grid();