aboutsummaryrefslogtreecommitdiff
path: root/flip.c
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2008-09-13 18:26:53 +0000
committerSimon Tatham <anakin@pobox.com>2008-09-13 18:26:53 +0000
commit5ead207060a3e1f74ad6200fdf02934457394bc2 (patch)
tree453b3ebe7556d1a1222c0a1e23f190d6eb119893 /flip.c
parentfe1b91ac49cc2f4cd07801535dc19103a8ebeb70 (diff)
downloadpuzzles-5ead207060a3e1f74ad6200fdf02934457394bc2.zip
puzzles-5ead207060a3e1f74ad6200fdf02934457394bc2.tar.gz
puzzles-5ead207060a3e1f74ad6200fdf02934457394bc2.tar.bz2
puzzles-5ead207060a3e1f74ad6200fdf02934457394bc2.tar.xz
Patch from James H to centralise some generally useful cursor-
handling functionality into misc.c. [originally from svn r8176]
Diffstat (limited to 'flip.c')
-rw-r--r--flip.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/flip.c b/flip.c
index 10c4825..d430217 100644
--- a/flip.c
+++ b/flip.c
@@ -905,8 +905,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
int w = state->w, h = state->h, wh = w * h;
char buf[80], *nullret = NULL;
- if (button == LEFT_BUTTON || button == CURSOR_SELECT ||
- button == ' ' || button == '\r' || button == '\n') {
+ if (button == LEFT_BUTTON || IS_CURSOR_SELECT(button)) {
int tx, ty;
if (button == LEFT_BUTTON) {
tx = FROMCOORD(x), ty = FROMCOORD(y);
@@ -936,8 +935,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
}
}
}
- else if (button == CURSOR_UP || button == CURSOR_DOWN ||
- button == CURSOR_RIGHT || button == CURSOR_LEFT) {
+ else if (IS_CURSOR_MOVE(button)) {
int dx = 0, dy = 0;
switch (button) {
case CURSOR_UP: dy = -1; break;