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:
12
pattern.c
12
pattern.c
@ -1336,7 +1336,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
||||
ui->drag_start_y = ui->drag_end_y = y;
|
||||
ui->cur_visible = false;
|
||||
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
}
|
||||
|
||||
if (ui->dragging && button == ui->drag) {
|
||||
@ -1365,7 +1365,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
||||
ui->drag_end_x = x;
|
||||
ui->drag_end_y = y;
|
||||
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
}
|
||||
|
||||
if (ui->dragging && button == ui->release) {
|
||||
@ -1393,7 +1393,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
||||
x1, y1, x2-x1+1, y2-y1+1);
|
||||
return dupstr(buf);
|
||||
} else
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
}
|
||||
|
||||
if (IS_CURSOR_MOVE(button)) {
|
||||
@ -1401,12 +1401,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
||||
char buf[80];
|
||||
move_cursor(button, &ui->cur_x, &ui->cur_y, state->common->w, state->common->h, false);
|
||||
ui->cur_visible = true;
|
||||
if (!control && !shift) return UI_UPDATE;
|
||||
if (!control && !shift) return MOVE_UI_UPDATE;
|
||||
|
||||
newstate = control ? shift ? GRID_UNKNOWN : GRID_FULL : GRID_EMPTY;
|
||||
if (state->grid[y * state->common->w + x] == newstate &&
|
||||
state->grid[ui->cur_y * state->common->w + ui->cur_x] == newstate)
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
|
||||
sprintf(buf, "%c%d,%d,%d,%d", control ? shift ? 'U' : 'F' : 'E',
|
||||
min(x, ui->cur_x), min(y, ui->cur_y),
|
||||
@ -1421,7 +1421,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
||||
|
||||
if (!ui->cur_visible) {
|
||||
ui->cur_visible = true;
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
}
|
||||
|
||||
if (button == CURSOR_SELECT2)
|
||||
|
Reference in New Issue
Block a user