mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-20 15:41:30 -07:00
Rename UI_UPDATE as MOVE_UI_UPDATE
All the other constants named UI_* are special key names that can be passed to midend_process_key(), but UI_UPDATE is a special return value from the back-end interpret_move() function instead. This renaming makes the distinction clear and provides a naming convention for future special return values from interpret_move().
This commit is contained in:
8
rect.c
8
rect.c
@ -2418,7 +2418,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
|
||||
move_cursor(button, &ui->cur_x, &ui->cur_y, from->w, from->h, false);
|
||||
ui->cur_visible = true;
|
||||
active = true;
|
||||
if (!ui->cur_dragging) return UI_UPDATE;
|
||||
if (!ui->cur_dragging) return MOVE_UI_UPDATE;
|
||||
coord_round((float)ui->cur_x + 0.5F, (float)ui->cur_y + 0.5F, &xc, &yc);
|
||||
} else if (IS_CURSOR_SELECT(button)) {
|
||||
if (ui->drag_start_x >= 0 && !ui->cur_dragging) {
|
||||
@ -2431,7 +2431,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
|
||||
if (!ui->cur_visible) {
|
||||
assert(!ui->cur_dragging);
|
||||
ui->cur_visible = true;
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
}
|
||||
coord_round((float)ui->cur_x + 0.5F, (float)ui->cur_y + 0.5F, &xc, &yc);
|
||||
erasing = (button == CURSOR_SELECT2);
|
||||
@ -2452,7 +2452,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
|
||||
reset_ui(ui); /* cancel keyboard dragging */
|
||||
ui->cur_dragging = false;
|
||||
}
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
} else if (button != LEFT_DRAG && button != RIGHT_DRAG) {
|
||||
return NULL;
|
||||
}
|
||||
@ -2536,7 +2536,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
|
||||
if (ret)
|
||||
return ret; /* a move has been made */
|
||||
else if (active)
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user