Nit: "warning: extra tokens at end of #endif directive"

[sgt/puzzles] / fifteen.c

diff --git a/fifteen.c b/fifteen.c
index 9d138b1..5bcc87a 100644 (file)
--- a/fifteen.c
+++ b/fifteen.c
@@ -456,6 +456,8 @@ static game_state *make_move(game_state *from, game_ui *ui,
     int gx, gy, dx, dy, ux, uy, up, p;
     game_state *ret;
 
+    button &= ~MOD_MASK;
+
     gx = X(from, from->gap_pos);
     gy = Y(from, from->gap_pos);
 
@@ -776,7 +778,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
 }
 
 static float game_anim_length(game_state *oldstate,
-                             game_state *newstate, int dir)
+                             game_state *newstate, int dir, game_ui *ui)
 {
     if ((dir > 0 && newstate->just_used_solve) ||
        (dir < 0 && oldstate->just_used_solve))
@@ -786,7 +788,7 @@ static float game_anim_length(game_state *oldstate,
 }
 
 static float game_flash_length(game_state *oldstate,
-                              game_state *newstate, int dir)
+                              game_state *newstate, int dir, game_ui *ui)
 {
     if (!oldstate->completed && newstate->completed &&
        !oldstate->used_solve && !newstate->used_solve)