mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-21 16:05:44 -07:00
Unequal: stop ignoring keys 'h' and 'm' while cursor active.
At least, so long as 'h' and 'm' are not "numbers".
This commit is contained in:

committed by
Simon Tatham

parent
87b2758b9c
commit
dc688b1f23
@ -1427,18 +1427,15 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (ui->hshow) {
|
|
||||||
debug(("button %d, cbutton %d", button, (int)((char)button)));
|
|
||||||
n = c2n(button, state->order);
|
n = c2n(button, state->order);
|
||||||
|
if (ui->hshow && n >= 0 && n <= ds->order) {
|
||||||
|
debug(("button %d, cbutton %d", button, (int)((char)button)));
|
||||||
|
|
||||||
debug(("n %d, h (%d,%d) p %d flags 0x%x nums %d",
|
debug(("n %d, h (%d,%d) p %d flags 0x%x nums %d",
|
||||||
n, ui->hx, ui->hy, ui->hpencil,
|
n, ui->hx, ui->hy, ui->hpencil,
|
||||||
GRID(state, flags, ui->hx, ui->hy),
|
GRID(state, flags, ui->hx, ui->hy),
|
||||||
GRID(state, nums, ui->hx, ui->hy)));
|
GRID(state, nums, ui->hx, ui->hy)));
|
||||||
|
|
||||||
if (n < 0 || n > ds->order)
|
|
||||||
return NULL; /* out of range */
|
|
||||||
if (GRID(state, flags, ui->hx, ui->hy) & F_IMMUTABLE)
|
if (GRID(state, flags, ui->hx, ui->hy) & F_IMMUTABLE)
|
||||||
return NULL; /* can't edit immutable square (!) */
|
return NULL; /* can't edit immutable square (!) */
|
||||||
if (ui->hpencil && GRID(state, nums, ui->hx, ui->hy) > 0)
|
if (ui->hpencil && GRID(state, nums, ui->hx, ui->hy) > 0)
|
||||||
|
Reference in New Issue
Block a user