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

In Group, the keyboard-controlled cursor should respect user

Browse Source 
rearrangement of the rows and columns.

[originally from svn r9372]
This commit is contained in:
Simon Tatham
2011-12-21 13:46:48 +00:00
parent 3107237af4
commit c4e486c2a1
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
unfinished/group.c
View File

@ -1201,6 +1201,18 @@ static int check_errors(game_state *state, long *errors)
return errs; return errs;
} }
static int find_in_sequence(digit *seq, int len, digit n)
{
int i;
for (i = 0; i < len; i++)
if (seq[i] == n)
return i;
assert(!"Should never get here");
return -1;
}
static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
int x, int y, int button) int x, int y, int button)
{ {
@ -1292,7 +1304,11 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
} }
if (IS_CURSOR_MOVE(button)) { if (IS_CURSOR_MOVE(button)) {
move_cursor(button, &ui->hx, &ui->hy, w, w, 0); int cx = find_in_sequence(state->sequence, w, ui->hx);
int cy = find_in_sequence(state->sequence, w, ui->hy);
move_cursor(button, &cx, &cy, w, w, 0);
ui->hx = state->sequence[cx];
ui->hy = state->sequence[cy];
ui->hshow = ui->hcursor = 1; ui->hshow = ui->hcursor = 1;
return ""; return "";
} }