aboutsummaryrefslogtreecommitdiff
path: root/unfinished
diff options
context:
space:
mode:
authorBen Harris <bjh21@bjh21.me.uk>2023-06-04 18:42:58 +0100
committerBen Harris <bjh21@bjh21.me.uk>2023-06-11 00:33:27 +0100
commita9af3fda1d784c42d486a019a0a4e947f762af70 (patch)
tree8cb5d37274541dae804cd11d944feb41ffa1d40b /unfinished
parentb08c13f5f47a8541961fc150142523b061d3d9c6 (diff)
downloadpuzzles-a9af3fda1d784c42d486a019a0a4e947f762af70.zip
puzzles-a9af3fda1d784c42d486a019a0a4e947f762af70.tar.gz
puzzles-a9af3fda1d784c42d486a019a0a4e947f762af70.tar.bz2
puzzles-a9af3fda1d784c42d486a019a0a4e947f762af70.tar.xz
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().
Diffstat (limited to 'unfinished')
-rw-r--r--unfinished/group.c20
-rw-r--r--unfinished/slide.c6
2 files changed, 13 insertions, 13 deletions
diff --git a/unfinished/group.c b/unfinished/group.c
index 7faee89..b008e82 100644
--- a/unfinished/group.c
+++ b/unfinished/group.c
@@ -1519,13 +1519,13 @@ static char *interpret_move(const game_state *state, game_ui *ui,
ui->drag |= 4; /* some movement has happened */
if (tcoord >= 0 && tcoord < w) {
ui->dragpos = tcoord;
- return UI_UPDATE;
+ return MOVE_UI_UPDATE;
}
} else if (IS_MOUSE_RELEASE(button)) {
if (ui->drag & 4) {
ui->drag = 0; /* end drag */
if (state->sequence[ui->dragpos] == ui->dragnum)
- return UI_UPDATE; /* drag was a no-op overall */
+ return MOVE_UI_UPDATE; /* drag was a no-op overall */
sprintf(buf, "D%d,%d", ui->dragnum, ui->dragpos);
return dupstr(buf);
} else {
@@ -1536,7 +1536,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
state->sequence[ui->edgepos]);
return dupstr(buf);
} else
- return UI_UPDATE; /* no-op */
+ return MOVE_UI_UPDATE; /* no-op */
}
}
} else if (IS_MOUSE_DOWN(button)) {
@@ -1559,7 +1559,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
ui->hpencil = false;
}
ui->hcursor = false;
- return UI_UPDATE;
+ return MOVE_UI_UPDATE;
}
if (button == RIGHT_BUTTON) {
/*
@@ -1583,20 +1583,20 @@ static char *interpret_move(const game_state *state, game_ui *ui,
ui->hshow = false;
}
ui->hcursor = false;
- return UI_UPDATE;
+ return MOVE_UI_UPDATE;
}
} else if (tx >= 0 && tx < w && ty == -1) {
ui->drag = 2;
ui->dragnum = state->sequence[tx];
ui->dragpos = tx;
ui->edgepos = FROMCOORD(x + TILESIZE/2);
- return UI_UPDATE;
+ return MOVE_UI_UPDATE;
} else if (ty >= 0 && ty < w && tx == -1) {
ui->drag = 1;
ui->dragnum = state->sequence[ty];
ui->dragpos = ty;
ui->edgepos = FROMCOORD(y + TILESIZE/2);
- return UI_UPDATE;
+ return MOVE_UI_UPDATE;
}
} else if (IS_MOUSE_DRAG(button)) {
if (!ui->hpencil &&
@@ -1609,7 +1609,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
ui->odx = ui->ody = 0;
ui->odn = 1;
}
- return UI_UPDATE;
+ return MOVE_UI_UPDATE;
}
if (IS_CURSOR_MOVE(button)) {
@@ -1620,13 +1620,13 @@ static char *interpret_move(const game_state *state, game_ui *ui,
ui->hy = state->sequence[cy];
ui->hshow = true;
ui->hcursor = true;
- return UI_UPDATE;
+ return MOVE_UI_UPDATE;
}
if (ui->hshow &&
(button == CURSOR_SELECT)) {
ui->hpencil = !ui->hpencil;
ui->hcursor = true;
- return UI_UPDATE;
+ return MOVE_UI_UPDATE;
}
if (ui->hshow &&
diff --git a/unfinished/slide.c b/unfinished/slide.c
index c797d7e..4c4d989 100644
--- a/unfinished/slide.c
+++ b/unfinished/slide.c
@@ -1345,7 +1345,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
* And that's it. Update the display to reflect the start
* of a drag.
*/
- return UI_UPDATE;
+ return MOVE_UI_UPDATE;
} else if (button == LEFT_DRAG && ui->dragging) {
int dist, distlimit, dx, dy, s, px, py;
@@ -1372,7 +1372,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
if (px >= 0 && px < w && py >= 0 && py < h &&
ui->reachable[py*w+px]) {
ui->drag_currpos = py*w+px;
- return UI_UPDATE;
+ return MOVE_UI_UPDATE;
}
}
}
@@ -1389,7 +1389,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
sprintf(data, "M%d-%d", ui->drag_anchor, ui->drag_currpos);
str = dupstr(data);
} else
- str = UI_UPDATE;
+ str = MOVE_UI_UPDATE;
ui->dragging = false;
ui->drag_anchor = ui->drag_currpos = -1;