zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Distinguish MOVE_UNUSED from MOVE_NO_EFFECT in Fifteen

Browse Source
This commit is contained in:
Ben Harris
2023-06-15 21:53:56 +01:00
parent 1a316f47ad
commit 73e7bf73bb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fifteen.c
View File

@ -761,7 +761,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
nx = FROMCOORD(x); nx = FROMCOORD(x);
ny = FROMCOORD(y); ny = FROMCOORD(y);
if (nx < 0 || nx >= state->w || ny < 0 || ny >= state->h) 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)) { } else if (IS_CURSOR_MOVE(button)) {
button = flip_cursor(button); /* the default */ button = flip_cursor(button); /* the default */
if (ui->invert_cursor) 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); move_cursor(button, &nx, &ny, state->w, state->h, false);
} else if ((button == 'h' || button == 'H') && !state->completed) { } else if ((button == 'h' || button == 'H') && !state->completed) {
if (!compute_hint(state, &nx, &ny)) 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 } else
return NULL; /* no move */ return MOVE_UNUSED; /* no move */
/* /*
* Any click location should be equal to the gap location * 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 dupstr(buf);
} }
return NULL; return MOVE_NO_EFFECT;
} }
static game_state *execute_move(const game_state *from, const char *move) static game_state *execute_move(const game_state *from, const char *move)