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

Use move_cursor() for cursor movement in Guess

Browse Source 
This makes interpret_move() properly return MOVE_NO_EFFECT when the
cursor can't move, and simplifies the code as well.
This commit is contained in:
Ben Harris
2023-08-09 11:30:24 +01:00
parent 5ec86c03a8
commit 8c768e7444
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
guess.c
View File

@ -914,25 +914,15 @@ static char *interpret_move(const game_state *from, game_ui *ui,
} }
/* keyboard input */ /* keyboard input */
if (button == CURSOR_UP || button == CURSOR_DOWN) { if (IS_CURSOR_MOVE(button)) {
ui->display_cur = true;
if (button == CURSOR_DOWN && (ui->colour_cur+1) < from->params.ncolours)
ui->colour_cur++;
if (button == CURSOR_UP && ui->colour_cur > 0)
ui->colour_cur--;
ret = MOVE_UI_UPDATE;
} else if (button == 'h' || button == 'H' || button == '?') {
compute_hint(from, ui);
ret = MOVE_UI_UPDATE;
} else if (button == CURSOR_LEFT || button == CURSOR_RIGHT) {
int maxcur = from->params.npegs; int maxcur = from->params.npegs;
if (ui->markable) maxcur++; if (ui->markable) maxcur++;
ui->display_cur = true; ret = move_cursor(button, &ui->peg_cur, &ui->colour_cur,
if (button == CURSOR_RIGHT && (ui->peg_cur+1) < maxcur) maxcur, from->params.ncolours,
ui->peg_cur++; false, &ui->display_cur);
if (button == CURSOR_LEFT && ui->peg_cur > 0) } else if (button == 'h' || button == 'H' || button == '?') {
ui->peg_cur--; compute_hint(from, ui);
ret = MOVE_UI_UPDATE; ret = MOVE_UI_UPDATE;
} else if (button == CURSOR_SELECT) { } else if (button == CURSOR_SELECT) {
ui->display_cur = true; ui->display_cur = true;