From f8c2477ccbe2e86af2dba2c8483b7655d06652ec Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Sat, 12 Aug 2023 13:34:40 +0100 Subject: [PATCH] Twiddle: use move_cursor() for cursor movement --- twiddle.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/twiddle.c b/twiddle.c index 23241da..9aea4e4 100644 --- a/twiddle.c +++ b/twiddle.c @@ -666,18 +666,9 @@ static char *interpret_move(const game_state *state, game_ui *ui, button = button & (~MOD_MASK | MOD_NUM_KEYPAD); - if (IS_CURSOR_MOVE(button)) { - if (button == CURSOR_LEFT && ui->cur_x > 0) - ui->cur_x--; - if (button == CURSOR_RIGHT && (ui->cur_x+n) < (w)) - ui->cur_x++; - if (button == CURSOR_UP && ui->cur_y > 0) - ui->cur_y--; - if (button == CURSOR_DOWN && (ui->cur_y+n) < (h)) - ui->cur_y++; - ui->cur_visible = true; - return MOVE_UI_UPDATE; - } + if (IS_CURSOR_MOVE(button)) + return move_cursor(button, &ui->cur_x, &ui->cur_y, w-n+1, h-n+1, + false, &ui->cur_visible); if (button == LEFT_BUTTON || button == RIGHT_BUTTON) { /*