shithub: puzzles

Info  •  Files  •  Log  •  Branches

Flip: use move_cursor() for cursor movement

--- a/flip.c

+++ b/flip.c

@@ -982,22 +982,9 @@

                 return MOVE_NO_EFFECT;

             }

         }

-    }

-    else if (IS_CURSOR_MOVE(button)) {

-        int dx = 0, dy = 0;

-        switch (button) {

-        case CURSOR_UP:         dy = -1; break;

-        case CURSOR_DOWN:       dy = 1; break;

-        case CURSOR_RIGHT:      dx = 1; break;

-        case CURSOR_LEFT:       dx = -1; break;

-        default: assert(!"shouldn't get here");

-        }

-        ui->cx += dx; ui->cy += dy;

-        ui->cx = min(max(ui->cx, 0), state->w - 1);

-        ui->cy = min(max(ui->cy, 0), state->h - 1);

-        ui->cdraw = true;

-        nullret = MOVE_UI_UPDATE;

-    }

+    } else if (IS_CURSOR_MOVE(button))

+        nullret = move_cursor(button, &ui->cx, &ui->cy, state->w, state->h,

+                              false, &ui->cdraw);

     return nullret;

 }