~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a difficulty exception to prevent Pearl spinning forever when
[sgt/puzzles]
/
mines.c
diff --git
a/mines.c
b/mines.c
index
1d72bb2
..
13cdc0c
100644
(file)
--- a/
mines.c
+++ b/
mines.c
@@
-2170,7
+2170,7
@@
static int open_square(game_state *state, int x, int y)
static game_state *new_game(midend *me, game_params *params, char *desc)
{
game_state *state = snew(game_state);
static game_state *new_game(midend *me, game_params *params, char *desc)
{
game_state *state = snew(game_state);
- int i, wh, x, y,
ret,
masked;
+ int i, wh, x, y, masked;
unsigned char *bmp;
state->w = params->w;
unsigned char *bmp;
state->w = params->w;
@@
-2265,7
+2265,7
@@
static game_state *new_game(midend *me, game_params *params, char *desc)
}
if (x >= 0 && y >= 0)
}
if (x >= 0 && y >= 0)
-
ret =
open_square(state, x, y);
+ open_square(state, x, y);
sfree(bmp);
}
sfree(bmp);
}
@@
-3084,9
+3084,14
@@
static float game_flash_length(game_state *oldstate, game_state *newstate,
return 0.0F;
}
return 0.0F;
}
-static int game_
is_solved
(game_state *state)
+static int game_
status
(game_state *state)
{
{
- return state->won;
+ /*
+ * We report the game as lost only if the player has used the
+ * Solve function to reveal all the mines. Otherwise, we assume
+ * they'll undo and continue play.
+ */
+ return state->won ? (state->used_solve ? -1 : +1) : 0;
}
static int game_timing_state(game_state *state, game_ui *ui)
}
static int game_timing_state(game_state *state, game_ui *ui)
@@
-3139,7
+3144,7
@@
const struct game thegame = {
game_redraw,
game_anim_length,
game_flash_length,
game_redraw,
game_anim_length,
game_flash_length,
- game_
is_solved
,
+ game_
status
,
FALSE, FALSE, game_print_size, game_print,
TRUE, /* wants_statusbar */
TRUE, game_timing_state,
FALSE, FALSE, game_print_size, game_print,
TRUE, /* wants_statusbar */
TRUE, game_timing_state,