mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-20 23:51:29 -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:
14
unequal.c
14
unequal.c
@ -1531,7 +1531,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
||||
ui->hshow = true;
|
||||
}
|
||||
ui->hcursor = false;
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
}
|
||||
if (button == RIGHT_BUTTON) {
|
||||
/* pencil highlighting for non-filled squares */
|
||||
@ -1545,7 +1545,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
||||
ui->hshow = true;
|
||||
}
|
||||
ui->hcursor = false;
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1561,12 +1561,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
||||
ny != ui->hy + adjthan[i].dy); ++i);
|
||||
|
||||
if (i == 4)
|
||||
return UI_UPDATE; /* invalid direction, i.e. out of
|
||||
return MOVE_UI_UPDATE; /* invalid direction, i.e. out of
|
||||
* the board */
|
||||
|
||||
if (!(GRID(state, flags, ui->hx, ui->hy) & adjthan[i].f ||
|
||||
GRID(state, flags, nx, ny ) & adjthan[i].fo))
|
||||
return UI_UPDATE; /* no clue to toggle */
|
||||
return MOVE_UI_UPDATE; /* no clue to toggle */
|
||||
|
||||
if (state->mode == MODE_ADJACENT)
|
||||
self = (adjthan[i].dx >= 0 && adjthan[i].dy >= 0);
|
||||
@ -1585,13 +1585,13 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
||||
move_cursor(button, &ui->hx, &ui->hy, ds->order, ds->order, false);
|
||||
ui->hshow = true;
|
||||
ui->hcursor = true;
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
}
|
||||
}
|
||||
if (ui->hshow && IS_CURSOR_SELECT(button)) {
|
||||
ui->hpencil = !ui->hpencil;
|
||||
ui->hcursor = true;
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
}
|
||||
|
||||
n = c2n(button, state->order);
|
||||
@ -1622,7 +1622,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
|
||||
/* ... expect to remove the cursor in mouse mode. */
|
||||
if (!ui->hcursor) {
|
||||
ui->hshow = false;
|
||||
return UI_UPDATE;
|
||||
return MOVE_UI_UPDATE;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user