aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Harris <bjh21@bjh21.me.uk>2023-06-15 21:53:56 +0100
committerBen Harris <bjh21@bjh21.me.uk>2023-06-15 21:53:56 +0100
commit73e7bf73bbd68fbeac06ecdd77cc356c5365bb14 (patch)
tree5ae13dd9a8b0d8c4f5ffcf2ba5511bd35a8ad044
parent1a316f47ad3d1749b9b31a99cdb1ebf472fe1d85 (diff)
downloadpuzzles-73e7bf73bbd68fbeac06ecdd77cc356c5365bb14.zip
puzzles-73e7bf73bbd68fbeac06ecdd77cc356c5365bb14.tar.gz
puzzles-73e7bf73bbd68fbeac06ecdd77cc356c5365bb14.tar.bz2
puzzles-73e7bf73bbd68fbeac06ecdd77cc356c5365bb14.tar.xz
Distinguish MOVE_UNUSED from MOVE_NO_EFFECT in Fifteen
-rw-r--r--fifteen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fifteen.c b/fifteen.c
index a454a13..2f10122 100644
--- a/fifteen.c
+++ b/fifteen.c
@@ -761,7 +761,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
nx = FROMCOORD(x);
ny = FROMCOORD(y);
if (nx < 0 || nx >= state->w || ny < 0 || ny >= state->h)
- return NULL; /* out of bounds */
+ return MOVE_UNUSED; /* out of bounds */
} else if (IS_CURSOR_MOVE(button)) {
button = flip_cursor(button); /* the default */
if (ui->invert_cursor)
@@ -769,9 +769,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
move_cursor(button, &nx, &ny, state->w, state->h, false);
} else if ((button == 'h' || button == 'H') && !state->completed) {
if (!compute_hint(state, &nx, &ny))
- return NULL; /* shouldn't happen, since ^^we^^checked^^ */
+ return MOVE_NO_EFFECT;/* shouldn't happen, since ^^we^^checked^^ */
} else
- return NULL; /* no move */
+ return MOVE_UNUSED; /* no move */
/*
* Any click location should be equal to the gap location
@@ -782,7 +782,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
return dupstr(buf);
}
- return NULL;
+ return MOVE_NO_EFFECT;
}
static game_state *execute_move(const game_state *from, const char *move)