mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-20 15:41:30 -07:00
Galaxies: use new move_cursor() features
This commit is contained in:
11
galaxies.c
11
galaxies.c
@ -3021,16 +3021,15 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
|||||||
else
|
else
|
||||||
return MOVE_UI_UPDATE;
|
return MOVE_UI_UPDATE;
|
||||||
} else if (IS_CURSOR_MOVE(button)) {
|
} else if (IS_CURSOR_MOVE(button)) {
|
||||||
move_cursor(button, &ui->cur_x, &ui->cur_y, state->sx-1, state->sy-1,
|
int cx = ui->cur_x - 1, cy = ui->cur_y - 1;
|
||||||
false, NULL);
|
char *ret = move_cursor(button, &cx, &cy, state->sx-2, state->sy-2,
|
||||||
if (ui->cur_x < 1) ui->cur_x = 1;
|
false, &ui->cur_visible);
|
||||||
if (ui->cur_y < 1) ui->cur_y = 1;
|
ui->cur_x = cx + 1, ui->cur_y = cy + 1;
|
||||||
ui->cur_visible = true;
|
|
||||||
if (ui->dragging) {
|
if (ui->dragging) {
|
||||||
ui->dx = SCOORD(ui->cur_x);
|
ui->dx = SCOORD(ui->cur_x);
|
||||||
ui->dy = SCOORD(ui->cur_y);
|
ui->dy = SCOORD(ui->cur_y);
|
||||||
}
|
}
|
||||||
return MOVE_UI_UPDATE;
|
return ret;
|
||||||
} else if (IS_CURSOR_SELECT(button)) {
|
} else if (IS_CURSOR_SELECT(button)) {
|
||||||
if (!ui->cur_visible) {
|
if (!ui->cur_visible) {
|
||||||
ui->cur_visible = true;
|
ui->cur_visible = true;
|
||||||
|
Reference in New Issue
Block a user