Patch from James H to centralise some generally useful cursor-

[sgt-puzzles.git] / flip.c

diff --git a/flip.c b/flip.c
index 10c48250a06e240bfdc74d32296cbca062cafc72..d430217c30d1e35500e22a3ee3afab43f6aadf41 100644 (file)
--- 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;