X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/6dae1679977511f3dc97a15e558fc23b4d796012..e64991db95a699e4ea966a2406bfbe6bf5035f87:/pegs.c

diff --git a/pegs.c b/pegs.c
index ebc7085..195bca1 100644
--- a/pegs.c
+++ b/pegs.c
@@ -16,11 +16,15 @@
 #define GRID_PEG  1
 #define GRID_OBST 2
 
+#define GRID_CURSOR 10
+#define GRID_JUMPING 20
+
 enum {
     COL_BACKGROUND,
     COL_HIGHLIGHT,
     COL_LOWLIGHT,
     COL_PEG,
+    COL_CURSOR,
     NCOLOURS
 };
 
@@ -668,7 +672,7 @@ static char *validate_desc(game_params *params, char *desc)
     return NULL;
 }
 
-static game_state *new_game(midend_data *me, game_params *params, char *desc)
+static game_state *new_game(midend *me, game_params *params, char *desc)
 {
     int w = params->w, h = params->h;
     game_state *state = snew(game_state);
@@ -711,6 +715,11 @@ static char *solve_game(game_state *state, game_state *currstate,
     return NULL;
 }
 
+static int game_can_format_as_text_now(game_params *params)
+{
+    return TRUE;
+}
+
 static char *game_text_format(game_state *state)
 {
     int w = state->w, h = state->h;
@@ -734,14 +743,30 @@ struct game_ui {
     int dragging;		       /* boolean: is a drag in progress? */
     int sx, sy;			       /* grid coords of drag start cell */
     int dx, dy;			       /* pixel coords of current drag posn */
+    int cur_x, cur_y, cur_visible, cur_jumping;
 };
 
 static game_ui *new_ui(game_state *state)
 {
     game_ui *ui = snew(game_ui);
+    int x, y, v;
 
     ui->sx = ui->sy = ui->dx = ui->dy = 0;
     ui->dragging = FALSE;
+    ui->cur_visible = ui->cur_jumping = 0;
+
+    /* make sure we start the cursor somewhere on the grid. */
+    for (x = 0; x < state->w; x++) {
+        for (y = 0; y < state->h; y++) {
+            v = state->grid[y*state->w+x];
+            if (v == GRID_PEG || v == GRID_HOLE) {
+                ui->cur_x = x; ui->cur_y = y;
+                goto found;
+            }
+        }
+    }
+    assert(!"new_ui found nowhere for cursor");
+found:
 
     return ui;
 }
@@ -793,6 +818,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
 			    int x, int y, int button)
 {
     int w = state->w, h = state->h;
+    char buf[80];
 
     if (button == LEFT_BUTTON) {
 	int tx, ty;
@@ -819,6 +845,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
 	    ui->sy = ty;
 	    ui->dx = x;
 	    ui->dy = y;
+            ui->cur_visible = ui->cur_jumping = 0;
 	    return "";		       /* ui modified */
 	}
     } else if (button == LEFT_DRAG && ui->dragging) {
@@ -829,7 +856,6 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
 	ui->dy = y;
 	return "";		       /* ui modified */
     } else if (button == LEFT_RELEASE && ui->dragging) {
-	char buf[80];
 	int tx, ty, dx, dy;
 
 	/*
@@ -859,7 +885,60 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
 	 */
 	sprintf(buf, "%d,%d-%d,%d", ui->sx, ui->sy, tx, ty);
 	return dupstr(buf);
+    } else if (IS_CURSOR_MOVE(button)) {
+        if (!ui->cur_jumping) {
+            /* Not jumping; move cursor as usual, making sure we don't
+             * leave the gameboard (which may be an irregular shape) */
+            int cx = ui->cur_x, cy = ui->cur_y;
+            move_cursor(button, &cx, &cy, w, h, 0);
+            ui->cur_visible = 1;
+            if (state->grid[cy*w+cx] == GRID_HOLE ||
+                state->grid[cy*w+cx] == GRID_PEG) {
+                ui->cur_x = cx;
+                ui->cur_y = cy;
+            }
+            return "";
+        } else {
+            int dx, dy, mx, my, jx, jy;
+
+            /* We're jumping; if the requested direction has a hole, and
+             * there's a peg in the way, */
+            assert(state->grid[ui->cur_y*w+ui->cur_x] == GRID_PEG);
+            dx = (button == CURSOR_RIGHT) ? 1 : (button == CURSOR_LEFT) ? -1 : 0;
+            dy = (button == CURSOR_DOWN) ? 1 : (button == CURSOR_UP) ? -1 : 0;
+
+            mx = ui->cur_x+dx; my = ui->cur_y+dy;
+            jx = mx+dx; jy = my+dy;
+
+            ui->cur_jumping = 0; /* reset, whatever. */
+            if (jx >= 0 && jy >= 0 && jx < w && jy < h &&
+                state->grid[my*w+mx] == GRID_PEG &&
+                state->grid[jy*w+jx] == GRID_HOLE) {
+                /* Move cursor to the jumped-to location (this felt more
+                 * natural while playtesting) */
+                sprintf(buf, "%d,%d-%d,%d", ui->cur_x, ui->cur_y, jx, jy);
+                ui->cur_x = jx; ui->cur_y = jy;
+                return dupstr(buf);
+            }
+            return "";
+        }
+    } else if (IS_CURSOR_SELECT(button)) {
+        if (!ui->cur_visible) {
+            ui->cur_visible = 1;
+            return "";
+        }
+        if (ui->cur_jumping) {
+            ui->cur_jumping = 0;
+            return "";
+        }
+        if (state->grid[ui->cur_y*w+ui->cur_x] == GRID_PEG) {
+            /* cursor is on peg: next arrow-move wil jump. */
+            ui->cur_jumping = 1;
+            return "";
+        }
+        return NULL;
     }
+
     return NULL;
 }
 
@@ -869,7 +948,7 @@ static game_state *execute_move(game_state *state, char *move)
     int sx, sy, tx, ty;
     game_state *ret;
 
-    if (sscanf(move, "%d,%d-%d,%d", &sx, &sy, &tx, &ty)) {
+    if (sscanf(move, "%d,%d-%d,%d", &sx, &sy, &tx, &ty) == 4) {
 	int mx, my, dx, dy;
 
 	if (sx < 0 || sx >= w || sy < 0 || sy >= h)
@@ -929,19 +1008,18 @@ static void game_compute_size(game_params *params, int tilesize,
     *y = TILESIZE * params->h + 2 * BORDER;
 }
 
-static void game_set_size(game_drawstate *ds, game_params *params,
-			  int tilesize)
+static void game_set_size(drawing *dr, game_drawstate *ds,
+			  game_params *params, int tilesize)
 {
     ds->tilesize = tilesize;
 
     assert(TILESIZE > 0);
 
-    if (ds->drag_background)
-	blitter_free(ds->drag_background);
-    ds->drag_background = blitter_new(TILESIZE, TILESIZE);
+    assert(!ds->drag_background);      /* set_size is never called twice */
+    ds->drag_background = blitter_new(dr, TILESIZE, TILESIZE);
 }
 
-static float *game_colours(frontend *fe, game_state *state, int *ncolours)
+static float *game_colours(frontend *fe, int *ncolours)
 {
     float *ret = snewn(3 * NCOLOURS, float);
 
@@ -951,11 +1029,15 @@ static float *game_colours(frontend *fe, game_state *state, int *ncolours)
     ret[COL_PEG * 3 + 1] = 0.0F;
     ret[COL_PEG * 3 + 2] = 1.0F;
 
+    ret[COL_CURSOR * 3 + 0] = 0.5F;
+    ret[COL_CURSOR * 3 + 1] = 0.5F;
+    ret[COL_CURSOR * 3 + 2] = 1.0F;
+
     *ncolours = NCOLOURS;
     return ret;
 }
 
-static game_drawstate *game_new_drawstate(game_state *state)
+static game_drawstate *game_new_drawstate(drawing *dr, game_state *state)
 {
     int w = state->w, h = state->h;
     struct game_drawstate *ds = snew(struct game_drawstate);
@@ -978,33 +1060,47 @@ static game_drawstate *game_new_drawstate(game_state *state)
     return ds;
 }
 
-static void game_free_drawstate(game_drawstate *ds)
+static void game_free_drawstate(drawing *dr, game_drawstate *ds)
 {
     if (ds->drag_background)
-	blitter_free(ds->drag_background);
+	blitter_free(dr, ds->drag_background);
     sfree(ds->grid);
     sfree(ds);
 }
 
-static void draw_tile(frontend *fe, game_drawstate *ds,
+static void draw_tile(drawing *dr, game_drawstate *ds,
 		      int x, int y, int v, int bgcolour)
 {
+    int cursor = 0, jumping = 0, bg;
+
     if (bgcolour >= 0) {
-	draw_rect(fe, x, y, TILESIZE, TILESIZE, bgcolour);
+	draw_rect(dr, x, y, TILESIZE, TILESIZE, bgcolour);
+    }
+    if (v >= GRID_JUMPING) {
+        jumping = 1; v -= GRID_JUMPING;
+    }
+    if (v >= GRID_CURSOR) {
+        cursor = 1; v -= GRID_CURSOR;
     }
 
     if (v == GRID_HOLE) {
-	draw_circle(fe, x+TILESIZE/2, y+TILESIZE/2, TILESIZE/4,
-		    COL_LOWLIGHT, COL_LOWLIGHT);
+        bg = cursor ? COL_HIGHLIGHT : COL_LOWLIGHT;
+        assert(!jumping); /* can't jump from a hole! */
+	draw_circle(dr, x+TILESIZE/2, y+TILESIZE/2, TILESIZE/4,
+                    bg, bg);
     } else if (v == GRID_PEG) {
-	draw_circle(fe, x+TILESIZE/2, y+TILESIZE/2, TILESIZE/3,
-		    COL_PEG, COL_PEG);
+        bg = (cursor || jumping) ? COL_CURSOR : COL_PEG;
+	draw_circle(dr, x+TILESIZE/2, y+TILESIZE/2, TILESIZE/3,
+		    bg, bg);
+        bg = (!cursor || jumping) ? COL_PEG : COL_CURSOR;
+        draw_circle(dr, x+TILESIZE/2, y+TILESIZE/2, TILESIZE/4,
+                    bg, bg);
     }
 
-    draw_update(fe, x, y, TILESIZE, TILESIZE);
+    draw_update(dr, x, y, TILESIZE, TILESIZE);
 }
 
-static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
+static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate,
 			game_state *state, int dir, game_ui *ui,
 			float animtime, float flashtime)
 {
@@ -1023,13 +1119,13 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
      */
     if (ds->dragging) {
 	assert(ds->drag_background);
-        blitter_load(fe, ds->drag_background, ds->dragx, ds->dragy);
-        draw_update(fe, ds->dragx, ds->dragy, TILESIZE, TILESIZE);
+        blitter_load(dr, ds->drag_background, ds->dragx, ds->dragy);
+        draw_update(dr, ds->dragx, ds->dragy, TILESIZE, TILESIZE);
 	ds->dragging = FALSE;
     }
 
     if (!ds->started) {
-	draw_rect(fe, 0, 0,
+	draw_rect(dr, 0, 0,
 		  TILESIZE * state->w + 2 * BORDER,
 		  TILESIZE * state->h + 2 * BORDER, COL_BACKGROUND);
 
@@ -1050,10 +1146,10 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
 		    coords[3] = COORD(y+1) + HIGHLIGHT_WIDTH - 1;
 		    coords[4] = COORD(x) - HIGHLIGHT_WIDTH;
 		    coords[5] = COORD(y) - HIGHLIGHT_WIDTH;
-		    draw_polygon(fe, coords, 3, COL_HIGHLIGHT, COL_HIGHLIGHT);
+		    draw_polygon(dr, coords, 3, COL_HIGHLIGHT, COL_HIGHLIGHT);
 		    coords[4] = COORD(x+1) + HIGHLIGHT_WIDTH - 1;
 		    coords[5] = COORD(y+1) + HIGHLIGHT_WIDTH - 1;
-		    draw_polygon(fe, coords, 3, COL_LOWLIGHT, COL_LOWLIGHT);
+		    draw_polygon(dr, coords, 3, COL_LOWLIGHT, COL_LOWLIGHT);
 		}
 	for (y = 0; y < h; y++)
 	    for (x = 0; x < w; x++)
@@ -1062,11 +1158,11 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
 		     * Second pass: draw everything but the two
 		     * diagonal corners.
 		     */
-		    draw_rect(fe, COORD(x) - HIGHLIGHT_WIDTH,
+		    draw_rect(dr, COORD(x) - HIGHLIGHT_WIDTH,
 			      COORD(y) - HIGHLIGHT_WIDTH,
 			      TILESIZE + HIGHLIGHT_WIDTH,
 			      TILESIZE + HIGHLIGHT_WIDTH, COL_HIGHLIGHT);
-		    draw_rect(fe, COORD(x),
+		    draw_rect(dr, COORD(x),
 			      COORD(y),
 			      TILESIZE + HIGHLIGHT_WIDTH,
 			      TILESIZE + HIGHLIGHT_WIDTH, COL_LOWLIGHT);
@@ -1094,7 +1190,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
 			    coords[5] = coords[3] - HIGHLIGHT_WIDTH * (dx-sn*dy);
 			    coords[6] = coords[0] + HIGHLIGHT_WIDTH * (dy+sn*dx);
 			    coords[7] = coords[1] + HIGHLIGHT_WIDTH * (dx+sn*dy);
-			    draw_polygon(fe, coords, 4, c, c);
+			    draw_polygon(dr, coords, 4, c, c);
 			}
 		    }
 		}
@@ -1105,7 +1201,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
 		     * Second pass: draw everything but the two
 		     * diagonal corners.
 		     */
-		    draw_rect(fe, COORD(x),
+		    draw_rect(dr, COORD(x),
 			      COORD(y),
 			      TILESIZE,
 			      TILESIZE, COL_BACKGROUND);
@@ -1113,7 +1209,7 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
 
 	ds->started = TRUE;
 
-	draw_update(fe, 0, 0,
+	draw_update(dr, 0, 0,
 		    TILESIZE * state->w + 2 * BORDER,
 		    TILESIZE * state->h + 2 * BORDER);
     }
@@ -1133,10 +1229,14 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
 	     */
 	    if (ui->dragging && ui->sx == x && ui->sy == y && v == GRID_PEG)
 		v = GRID_HOLE;
+
+            if (ui->cur_visible && ui->cur_x == x && ui->cur_y == y)
+                v += ui->cur_jumping ? GRID_JUMPING : GRID_CURSOR;
+
 	    if (v != GRID_OBST &&
                 (bgcolour != ds->bgcolour || /* always redraw when flashing */
                  v != ds->grid[y*w+x])) {
-		draw_tile(fe, ds, COORD(x), COORD(y), v, bgcolour);
+		draw_tile(dr, ds, COORD(x), COORD(y), v, bgcolour);
 	    }
 	}
 
@@ -1147,8 +1247,8 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate,
 	ds->dragging = TRUE;
 	ds->dragx = ui->dx - TILESIZE/2;
 	ds->dragy = ui->dy - TILESIZE/2;
-	blitter_save(fe, ds->drag_background, ds->dragx, ds->dragy);
-	draw_tile(fe, ds, ds->dragx, ds->dragy, GRID_PEG, -1);
+	blitter_save(dr, ds->drag_background, ds->dragx, ds->dragy);
+	draw_tile(dr, ds, ds->dragx, ds->dragy, GRID_PEG, -1);
     }
 
     ds->bgcolour = bgcolour;
@@ -1169,22 +1269,30 @@ static float game_flash_length(game_state *oldstate, game_state *newstate,
         return 0.0F;
 }
 
-static int game_wants_statusbar(void)
+static int game_is_solved(game_state *state)
 {
-    return FALSE;
+    return state->completed;
 }
 
-static int game_timing_state(game_state *state)
+static int game_timing_state(game_state *state, game_ui *ui)
 {
     return TRUE;
 }
 
+static void game_print_size(game_params *params, float *x, float *y)
+{
+}
+
+static void game_print(drawing *dr, game_state *state, int tilesize)
+{
+}
+
 #ifdef COMBINED
 #define thegame pegs
 #endif
 
 const struct game thegame = {
-    "Pegs", "games.pegs",
+    "Pegs", "games.pegs", "pegs",
     default_params,
     game_fetch_preset,
     decode_params,
@@ -1199,7 +1307,7 @@ const struct game thegame = {
     dup_game,
     free_game,
     FALSE, solve_game,
-    TRUE, game_text_format,
+    TRUE, game_can_format_as_text_now, game_text_format,
     new_ui,
     free_ui,
     encode_ui,
@@ -1214,7 +1322,11 @@ const struct game thegame = {
     game_redraw,
     game_anim_length,
     game_flash_length,
-    game_wants_statusbar,
+    game_is_solved,
+    FALSE, FALSE, game_print_size, game_print,
+    FALSE,			       /* wants_statusbar */
     FALSE, game_timing_state,
-    0,				       /* mouse_priorities */
+    0,				       /* flags */
 };
+
+/* vim: set shiftwidth=4 tabstop=8: */