X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/8266f3fccfd8621ac980d6209cbeac94e0a9c69b..HEAD:/netslide.c?ds=sidebyside diff --git a/netslide.c b/netslide.c index 75c9498..8d18652 100644 --- a/netslide.c +++ b/netslide.c @@ -84,7 +84,7 @@ struct game_params { struct game_state { int width, height, cx, cy, wrapping, completed; - int used_solve, just_used_solve; + int used_solve; int move_count, movetarget; /* position (row or col number, starting at 0) of last move. */ @@ -159,15 +159,15 @@ static game_params *default_params(void) static const struct { int x, y, wrap, bprob; const char* desc; } netslide_presets[] = { - {3, 3, FALSE, 1.0, " easy"}, - {3, 3, FALSE, 0.0, " medium"}, - {3, 3, TRUE, 0.0, " hard"}, - {4, 4, FALSE, 1.0, " easy"}, - {4, 4, FALSE, 0.0, " medium"}, - {4, 4, TRUE, 0.0, " hard"}, - {5, 5, FALSE, 1.0, " easy"}, - {5, 5, FALSE, 0.0, " medium"}, - {5, 5, TRUE, 0.0, " hard"}, + {3, 3, FALSE, 1, " easy"}, + {3, 3, FALSE, 0, " medium"}, + {3, 3, TRUE, 0, " hard"}, + {4, 4, FALSE, 1, " easy"}, + {4, 4, FALSE, 0, " medium"}, + {4, 4, TRUE, 0, " hard"}, + {5, 5, FALSE, 1, " easy"}, + {5, 5, FALSE, 0, " medium"}, + {5, 5, TRUE, 0, " hard"}, }; static int game_fetch_preset(int i, char **name, game_params **params) @@ -182,7 +182,7 @@ static int game_fetch_preset(int i, char **name, game_params **params) ret->width = netslide_presets[i].x; ret->height = netslide_presets[i].y; ret->wrapping = netslide_presets[i].wrap; - ret->barrier_probability = netslide_presets[i].bprob; + ret->barrier_probability = (float)netslide_presets[i].bprob; ret->movetarget = 0; sprintf(str, "%dx%d%s", ret->width, ret->height, netslide_presets[i].desc); @@ -221,7 +221,7 @@ static void decode_params(game_params *ret, char const *string) if ( (ret->wrapping = (*p == 'w')) != 0 ) p++; if (*p == 'b') { - ret->barrier_probability = atof(++p); + ret->barrier_probability = (float)atof(++p); while (*p && (isdigit((unsigned char)*p) || *p == '.')) p++; } if (*p == 'm') { @@ -745,7 +745,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc) state->wrapping = params->wrapping; state->movetarget = params->movetarget; state->completed = 0; - state->used_solve = state->just_used_solve = FALSE; + state->used_solve = FALSE; state->move_count = 0; state->last_move_row = -1; state->last_move_col = -1; @@ -865,7 +865,6 @@ static game_state *dup_game(game_state *state) ret->movetarget = state->movetarget; ret->completed = state->completed; ret->used_solve = state->used_solve; - ret->just_used_solve = state->just_used_solve; ret->move_count = state->move_count; ret->last_move_row = state->last_move_row; ret->last_move_col = state->last_move_col; @@ -896,6 +895,11 @@ static char *solve_game(game_state *state, game_state *currstate, return dupstr(aux); } +static int game_can_format_as_text_now(game_params *params) +{ + return TRUE; +} + static char *game_text_format(game_state *state) { return NULL; @@ -975,8 +979,8 @@ struct game_ui { static game_ui *new_ui(game_state *state) { game_ui *ui = snew(game_ui); - ui->cur_x = state->width / 2; - ui->cur_y = state->height / 2; + ui->cur_x = 0; + ui->cur_y = -1; ui->cur_visible = FALSE; return ui; @@ -1048,29 +1052,55 @@ struct game_drawstate { int width, height; int tilesize; unsigned char *visible; + int cur_x, cur_y; }; static char *interpret_move(game_state *state, game_ui *ui, - game_drawstate *ds, int x, int y, int button) + const game_drawstate *ds, int x, int y, int button) { int cx, cy; - int n, dx, dy; + int dx, dy; char buf[80]; button &= ~MOD_MASK; - if (button != LEFT_BUTTON && button != RIGHT_BUTTON) - return NULL; + if (IS_CURSOR_MOVE(button)) { + int cpos, diff = 0; + cpos = c2pos(state->width, state->height, ui->cur_x, ui->cur_y); + diff = c2diff(state->width, state->height, ui->cur_x, ui->cur_y, button); + + if (diff != 0) { + do { /* we might have to do this more than once to skip missing arrows */ + cpos += diff; + pos2c(state->width, state->height, cpos, &ui->cur_x, &ui->cur_y); + } while (ui->cur_x == state->cx || ui->cur_y == state->cy); + } + + ui->cur_visible = 1; + return ""; + } - cx = (x - (BORDER + WINDOW_OFFSET + TILE_BORDER) + 2*TILE_SIZE) / TILE_SIZE - 2; - cy = (y - (BORDER + WINDOW_OFFSET + TILE_BORDER) + 2*TILE_SIZE) / TILE_SIZE - 2; + if (button == LEFT_BUTTON || button == RIGHT_BUTTON) { + cx = (x - (BORDER + WINDOW_OFFSET + TILE_BORDER) + 2*TILE_SIZE) / TILE_SIZE - 2; + cy = (y - (BORDER + WINDOW_OFFSET + TILE_BORDER) + 2*TILE_SIZE) / TILE_SIZE - 2; + ui->cur_visible = 0; + } else if (IS_CURSOR_SELECT(button)) { + if (ui->cur_visible) { + cx = ui->cur_x; + cy = ui->cur_y; + } else { + /* 'click' when cursor is invisible just makes cursor visible. */ + ui->cur_visible = 1; + return ""; + } + } else + return NULL; if (cy >= 0 && cy < state->height && cy != state->cy) { if (cx == -1) dx = +1; else if (cx == state->width) dx = -1; else return NULL; - n = state->width; dy = 0; } else if (cx >= 0 && cx < state->width && cx != state->cx) @@ -1078,7 +1108,6 @@ static char *interpret_move(game_state *state, game_ui *ui, if (cy == -1) dy = +1; else if (cy == state->height) dy = -1; else return NULL; - n = state->height; dx = 0; } else @@ -1111,7 +1140,7 @@ static game_state *execute_move(game_state *from, char *move) strlen(move) == from->width * from->height + 1) { int i; ret = dup_game(from); - ret->used_solve = ret->just_used_solve = TRUE; + ret->used_solve = TRUE; ret->completed = ret->move_count = 1; for (i = 0; i < from->width * from->height; i++) { @@ -1133,7 +1162,6 @@ static game_state *execute_move(game_state *from, char *move) return NULL; /* can't parse move string */ ret = dup_game(from); - ret->just_used_solve = FALSE; if (col) slide_col(ret, d, c); @@ -1184,6 +1212,7 @@ static game_drawstate *game_new_drawstate(drawing *dr, game_state *state) ds->visible = snewn(state->width * state->height, unsigned char); ds->tilesize = 0; /* not decided yet */ memset(ds->visible, 0xFF, state->width * state->height); + ds->cur_x = ds->cur_y = -1; return ds; } @@ -1276,8 +1305,8 @@ static float *game_colours(frontend *fe, int *ncolours) return ret; } -static void draw_thick_line(drawing *dr, int x1, int y1, int x2, int y2, - int colour) +static void draw_filled_line(drawing *dr, int x1, int y1, int x2, int y2, + int colour) { draw_line(dr, x1-1, y1, x2-1, y2, COL_WIRE); draw_line(dr, x1+1, y1, x2+1, y2, COL_WIRE); @@ -1348,8 +1377,8 @@ static void draw_barrier(drawing *dr, game_drawstate *ds, static void draw_tile(drawing *dr, game_drawstate *ds, game_state *state, int x, int y, int tile, float xshift, float yshift) { - int bx = BORDER + WINDOW_OFFSET + TILE_SIZE * x + (xshift * TILE_SIZE); - int by = BORDER + WINDOW_OFFSET + TILE_SIZE * y + (yshift * TILE_SIZE); + int bx = BORDER + WINDOW_OFFSET + TILE_SIZE * x + (int)(xshift * TILE_SIZE); + int by = BORDER + WINDOW_OFFSET + TILE_SIZE * y + (int)(yshift * TILE_SIZE); float cx, cy, ex, ey; int dir, col; @@ -1389,9 +1418,9 @@ static void draw_tile(drawing *dr, game_drawstate *ds, game_state *state, if (tile & dir) { ex = (TILE_SIZE - TILE_BORDER - 1.0F) / 2.0F * X(dir); ey = (TILE_SIZE - TILE_BORDER - 1.0F) / 2.0F * Y(dir); - draw_thick_line(dr, bx+(int)cx, by+(int)cy, - bx+(int)(cx+ex), by+(int)(cy+ey), - COL_WIRE); + draw_filled_line(dr, bx+(int)cx, by+(int)cy, + bx+(int)(cx+ex), by+(int)(cy+ey), + COL_WIRE); } } for (dir = 1; dir < 0x10; dir <<= 1) { @@ -1506,7 +1535,7 @@ static void draw_tile_barriers(drawing *dr, game_drawstate *ds, } static void draw_arrow(drawing *dr, game_drawstate *ds, - int x, int y, int xdx, int xdy) + int x, int y, int xdx, int xdy, int cur) { int coords[14]; int ydy = -xdx, ydx = xdy; @@ -1526,16 +1555,39 @@ static void draw_arrow(drawing *dr, game_drawstate *ds, POINT(5, 3 * TILE_SIZE / 8, TILE_SIZE / 2); /* left concave */ POINT(6, TILE_SIZE / 4, TILE_SIZE / 2); /* left corner */ - draw_polygon(dr, coords, 7, COL_LOWLIGHT, COL_TEXT); + draw_polygon(dr, coords, 7, cur ? COL_POWERED : COL_LOWLIGHT, COL_TEXT); +} + +static void draw_arrow_for_cursor(drawing *dr, game_drawstate *ds, + int cur_x, int cur_y, int cur) +{ + if (cur_x == -1 && cur_y == -1) + return; /* 'no cursur here */ + else if (cur_x == -1) /* LH column. */ + draw_arrow(dr, ds, 0, cur_y+1, 0, -1, cur); + else if (cur_x == ds->width) /* RH column */ + draw_arrow(dr, ds, ds->width, cur_y, 0, +1, cur); + else if (cur_y == -1) /* Top row */ + draw_arrow(dr, ds, cur_x, 0, +1, 0, cur); + else if (cur_y == ds->height) /* Bottom row */ + draw_arrow(dr, ds, cur_x+1, ds->height, -1, 0, cur); + else + assert(!"Invalid cursor position"); + + draw_update(dr, + cur_x * TILE_SIZE + BORDER + WINDOW_OFFSET, + cur_y * TILE_SIZE + BORDER + WINDOW_OFFSET, + TILE_SIZE, TILE_SIZE); } static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, game_state *state, int dir, game_ui *ui, float t, float ft) { - int x, y, tx, ty, frame; + int x, y, frame; unsigned char *active; float xshift = 0.0; float yshift = 0.0; + int cur_x = -1, cur_y = -1; /* * Clear the screen and draw the exterior barrier lines if this @@ -1592,15 +1644,26 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, */ for (x = 0; x < ds->width; x++) { if (x == state->cx) continue; - draw_arrow(dr, ds, x, 0, +1, 0); - draw_arrow(dr, ds, x+1, ds->height, -1, 0); + draw_arrow(dr, ds, x, 0, +1, 0, 0); + draw_arrow(dr, ds, x+1, ds->height, -1, 0, 0); } for (y = 0; y < ds->height; y++) { if (y == state->cy) continue; - draw_arrow(dr, ds, ds->width, y, 0, +1); - draw_arrow(dr, ds, 0, y+1, 0, -1); + draw_arrow(dr, ds, ds->width, y, 0, +1, 0); + draw_arrow(dr, ds, 0, y+1, 0, -1, 0); } } + if (ui->cur_visible) { + cur_x = ui->cur_x; cur_y = ui->cur_y; + } + if (cur_x != ds->cur_x || cur_y != ds->cur_y) { + /* Cursor has changed; redraw two (prev and curr) arrows. */ + assert(cur_x != state->cx && cur_y != state->cy); + + draw_arrow_for_cursor(dr, ds, cur_x, cur_y, 1); + draw_arrow_for_cursor(dr, ds, ds->cur_x, ds->cur_y, 0); + ds->cur_x = cur_x; ds->cur_y = cur_y; + } /* Check if this is an undo. If so, we will need to run any animation * backwards. @@ -1612,16 +1675,15 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, t = ANIM_TIME - t; } - tx = ty = -1; if (oldstate && (t < ANIM_TIME)) { /* * We're animating a slide, of row/column number * state->last_move_pos, in direction * state->last_move_dir */ - xshift = state->last_move_row == -1 ? 0.0 : + xshift = state->last_move_row == -1 ? 0.0F : (1 - t / ANIM_TIME) * state->last_move_dir; - yshift = state->last_move_col == -1 ? 0.0 : + yshift = state->last_move_col == -1 ? 0.0F : (1 - t / ANIM_TIME) * state->last_move_dir; } @@ -1675,8 +1737,8 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, index(state, ds->visible, x, y) == 0xFF || (x == state->last_move_col || y == state->last_move_row)) { - float xs = (y == state->last_move_row ? xshift : 0.0); - float ys = (x == state->last_move_col ? yshift : 0.0); + float xs = (y == state->last_move_row ? xshift : (float)0.0); + float ys = (x == state->last_move_col ? yshift : (float)0.0); draw_tile(dr, ds, state, x, y, c, xs, ys); if (xs < 0 && x == 0) @@ -1736,13 +1798,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, static float game_anim_length(game_state *oldstate, game_state *newstate, int dir, game_ui *ui) { - /* - * Don't animate an auto-solve move. - */ - if ((dir > 0 && newstate->just_used_solve) || - (dir < 0 && oldstate->just_used_solve)) - return 0.0F; - return ANIM_TIME; } @@ -1771,9 +1826,9 @@ static float game_flash_length(game_state *oldstate, return 0.0F; } -static int game_wants_statusbar(void) +static int game_status(game_state *state) { - return TRUE; + return state->completed ? +1 : 0; } static int game_timing_state(game_state *state, game_ui *ui) @@ -1794,7 +1849,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize) #endif const struct game thegame = { - "Netslide", "games.netslide", + "Netslide", "games.netslide", "netslide", default_params, game_fetch_preset, decode_params, @@ -1809,7 +1864,7 @@ const struct game thegame = { dup_game, free_game, TRUE, solve_game, - FALSE, game_text_format, + FALSE, game_can_format_as_text_now, game_text_format, new_ui, free_ui, encode_ui, @@ -1824,8 +1879,11 @@ const struct game thegame = { game_redraw, game_anim_length, game_flash_length, + game_status, FALSE, FALSE, game_print_size, game_print, - game_wants_statusbar, + TRUE, /* wants_statusbar */ FALSE, game_timing_state, 0, /* flags */ }; + +/* vim: set shiftwidth=4 tabstop=8: */