X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=flip.c;h=2249698c8a18b6770e00a49b4e7fed16ad2cf28b;hb=3234912f921916a1b8da164fd61dc75579358577;hp=44fcf15fdf033b87248ebf635e2e481fd4d3aa58;hpb=dd175e490a197026210ba4432eec6236971c6173;p=sgt-puzzles.git diff --git a/flip.c b/flip.c index 44fcf15..2249698 100644 --- a/flip.c +++ b/flip.c @@ -106,7 +106,7 @@ static void free_params(game_params *params) sfree(params); } -static game_params *dup_params(game_params *params) +static game_params *dup_params(const game_params *params) { game_params *ret = snew(game_params); *ret = *params; /* structure copy */ @@ -131,7 +131,7 @@ static void decode_params(game_params *ret, char const *string) } } -static char *encode_params(game_params *params, int full) +static char *encode_params(const game_params *params, int full) { char data[256]; @@ -141,7 +141,7 @@ static char *encode_params(game_params *params, int full) return dupstr(data); } -static config_item *game_configure(game_params *params) +static config_item *game_configure(const game_params *params) { config_item *ret = snewn(4, config_item); char buf[80]; @@ -171,7 +171,7 @@ static config_item *game_configure(game_params *params) return ret; } -static game_params *custom_params(config_item *cfg) +static game_params *custom_params(const config_item *cfg) { game_params *ret = snew(game_params); @@ -182,7 +182,7 @@ static game_params *custom_params(config_item *cfg) return ret; } -static char *validate_params(game_params *params, int full) +static char *validate_params(const game_params *params, int full) { if (params->w <= 0 || params->h <= 0) return "Width and height must both be greater than zero"; @@ -208,7 +208,7 @@ static char *encode_bitmap(unsigned char *bmp, int len) return ret; } -static void decode_bitmap(unsigned char *bmp, int len, char *hex) +static void decode_bitmap(unsigned char *bmp, int len, const char *hex) { int slen = (len + 3) / 4; int i; @@ -347,7 +347,7 @@ static void addneighbours(tree234 *t, int w, int h, int cx, int cy, addsq(t, w, h, cx, cy, x, y+1, matrix); } -static char *new_game_desc(game_params *params, random_state *rs, +static char *new_game_desc(const game_params *params, random_state *rs, char **aux, int interactive) { int w = params->w, h = params->h, wh = w * h; @@ -596,7 +596,7 @@ static char *new_game_desc(game_params *params, random_state *rs, return ret; } -static char *validate_desc(game_params *params, char *desc) +static char *validate_desc(const game_params *params, const char *desc) { int w = params->w, h = params->h, wh = w * h; int mlen = (wh*wh+3)/4, glen = (wh+3)/4; @@ -613,7 +613,8 @@ static char *validate_desc(game_params *params, char *desc) return NULL; } -static game_state *new_game(midend *me, game_params *params, char *desc) +static game_state *new_game(midend *me, const game_params *params, + const char *desc) { int w = params->w, h = params->h, wh = w * h; int mlen = (wh*wh+3)/4; @@ -636,7 +637,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc) return state; } -static game_state *dup_game(game_state *state) +static game_state *dup_game(const game_state *state) { game_state *ret = snew(game_state); @@ -671,8 +672,8 @@ static void rowxor(unsigned char *row1, unsigned char *row2, int len) row1[i] ^= row2[i]; } -static char *solve_game(game_state *state, game_state *currstate, - char *aux, char **error) +static char *solve_game(const game_state *state, const game_state *currstate, + const char *aux, char **error) { int w = state->w, h = state->h, wh = w * h; unsigned char *equations, *solution, *shortest; @@ -853,16 +854,56 @@ static char *solve_game(game_state *state, game_state *currstate, return ret; } -static char *game_text_format(game_state *state) +static int game_can_format_as_text_now(const game_params *params) { - return NULL; + return TRUE; } +#define RIGHT 1 +#define DOWN gw + +static char *game_text_format(const game_state *state) +{ + int w = state->w, h = state->h, wh = w*h, r, c, dx, dy; + int cw = 4, ch = 4, gw = w * cw + 2, gh = h * ch + 1, len = gw * gh; + char *board = snewn(len + 1, char); + + memset(board, ' ', len - 1); + + for (r = 0; r < h; ++r) { + for (c = 0; c < w; ++c) { + int cell = r*ch*gw + c*cw, center = cell+(ch/2)*DOWN + cw/2*RIGHT; + char flip = (state->grid[r*w + c] & 1) ? '#' : '.'; + for (dy = -1 + (r == 0); dy <= 1 - (r == h - 1); ++dy) + for (dx = -1 + (c == 0); dx <= 1 - (c == w - 1); ++dx) + if (state->matrix->matrix[(r*w+c)*wh + ((r+dy)*w + c+dx)]) + board[center + dy*DOWN + dx*RIGHT] = flip; + board[cell] = '+'; + for (dx = 1; dx < cw; ++dx) board[cell+dx*RIGHT] = '-'; + for (dy = 1; dy < ch; ++dy) board[cell+dy*DOWN] = '|'; + } + board[r*ch*gw + gw - 2] = '+'; + board[r*ch*gw + gw - 1] = '\n'; + for (dy = 1; dy < ch; ++dy) { + board[r*ch*gw + gw - 2 + dy*DOWN] = '|'; + board[r*ch*gw + gw - 1 + dy*DOWN] = '\n'; + } + } + memset(board + len - gw, '-', gw - 2); + for (c = 0; c <= w; ++c) board[len - gw + cw*c] = '+'; + board[len - 1] = '\n'; + board[len] = '\0'; + return board; +} + +#undef RIGHT +#undef DOWN + struct game_ui { int cx, cy, cdraw; }; -static game_ui *new_ui(game_state *state) +static game_ui *new_ui(const game_state *state) { game_ui *ui = snew(game_ui); ui->cx = ui->cy = ui->cdraw = 0; @@ -874,17 +915,17 @@ static void free_ui(game_ui *ui) sfree(ui); } -static char *encode_ui(game_ui *ui) +static char *encode_ui(const game_ui *ui) { return NULL; } -static void decode_ui(game_ui *ui, char *encoding) +static void decode_ui(game_ui *ui, const char *encoding) { } -static void game_changed_state(game_ui *ui, game_state *oldstate, - game_state *newstate) +static void game_changed_state(game_ui *ui, const game_state *oldstate, + const game_state *newstate) { } @@ -894,14 +935,14 @@ struct game_drawstate { int tilesize; }; -static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, - int x, int y, int button) +static char *interpret_move(const game_state *state, game_ui *ui, + const game_drawstate *ds, + int x, int y, int button) { 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); @@ -931,8 +972,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; @@ -951,7 +991,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, return nullret; } -static game_state *execute_move(game_state *from, char *move) +static game_state *execute_move(const game_state *from, const char *move) { int w = from->w, h = from->h, wh = w * h; game_state *ret; @@ -1002,8 +1042,8 @@ static game_state *execute_move(game_state *from, char *move) * Drawing routines. */ -static void game_compute_size(game_params *params, int tilesize, - int *x, int *y) +static void game_compute_size(const game_params *params, int tilesize, + int *x, int *y) { /* Ick: fake up `ds->tilesize' for macro expansion purposes */ struct { int tilesize; } ads, *ds = &ads; @@ -1014,12 +1054,12 @@ static void game_compute_size(game_params *params, int tilesize, } static void game_set_size(drawing *dr, game_drawstate *ds, - game_params *params, int tilesize) + const game_params *params, int tilesize) { ds->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); @@ -1053,7 +1093,7 @@ static float *game_colours(frontend *fe, game_state *state, int *ncolours) return ret; } -static game_drawstate *game_new_drawstate(drawing *dr, game_state *state) +static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state) { struct game_drawstate *ds = snew(struct game_drawstate); int i; @@ -1075,9 +1115,8 @@ static void game_free_drawstate(drawing *dr, game_drawstate *ds) sfree(ds); } -static void draw_tile(drawing *dr, game_drawstate *ds, - game_state *state, int x, int y, int tile, int anim, - float animtime) +static void draw_tile(drawing *dr, game_drawstate *ds, const game_state *state, + int x, int y, int tile, int anim, float animtime) { int w = ds->w, h = ds->h, wh = w * h; int bx = x * TILE_SIZE + BORDER, by = y * TILE_SIZE + BORDER; @@ -1096,12 +1135,12 @@ static void draw_tile(drawing *dr, game_drawstate *ds, coords[0] = bx + TILE_SIZE; coords[1] = by; - coords[2] = bx + TILE_SIZE * animtime; - coords[3] = by + TILE_SIZE * animtime; + coords[2] = bx + (int)((float)TILE_SIZE * animtime); + coords[3] = by + (int)((float)TILE_SIZE * animtime); coords[4] = bx; coords[5] = by + TILE_SIZE; - coords[6] = bx + TILE_SIZE - TILE_SIZE * animtime; - coords[7] = by + TILE_SIZE - TILE_SIZE * animtime; + coords[6] = bx + TILE_SIZE - (int)((float)TILE_SIZE * animtime); + coords[7] = by + TILE_SIZE - (int)((float)TILE_SIZE * animtime); colour = (tile & 1 ? COL_WRONG : COL_RIGHT); if (animtime < 0.5) @@ -1152,9 +1191,10 @@ static void draw_tile(drawing *dr, game_drawstate *ds, draw_update(dr, bx+1, by+1, TILE_SIZE-1, TILE_SIZE-1); } -static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, - game_state *state, int dir, game_ui *ui, - float animtime, float flashtime) +static void game_redraw(drawing *dr, game_drawstate *ds, + const game_state *oldstate, const game_state *state, + int dir, const game_ui *ui, + float animtime, float flashtime) { int w = ds->w, h = ds->h, wh = w * h; int i, flashframe; @@ -1182,7 +1222,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, } if (flashtime) - flashframe = flashtime / FLASH_FRAME; + flashframe = (int)(flashtime / FLASH_FRAME); else flashframe = -1; @@ -1193,7 +1233,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, int fx, fy, fd; int v = state->grid[i]; int vv; - int hintmask = (state->hints_active ? ~0 : ~2); if (flashframe >= 0) { fx = (w+1)/2 - min(x+1, w-x); @@ -1205,11 +1244,12 @@ static void game_redraw(drawing *dr, game_drawstate *ds, game_state *oldstate, v &= ~1; } - v &= hintmask; + if (!state->hints_active) + v &= ~2; if (ui->cdraw && ui->cx == x && ui->cy == y) v |= 4; - if (oldstate && ((state->grid[i] ^ oldstate->grid[i]) & hintmask)) + if (oldstate && ((state->grid[i] ^ oldstate->grid[i]) &~ 2)) vv = 255; /* means `animated' */ else vv = v; @@ -1233,14 +1273,14 @@ 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) +static float game_anim_length(const game_state *oldstate, + const game_state *newstate, int dir, game_ui *ui) { return ANIM_TIME; } -static float game_flash_length(game_state *oldstate, game_state *newstate, - int dir, game_ui *ui) +static float game_flash_length(const game_state *oldstate, + const game_state *newstate, int dir, game_ui *ui) { if (!oldstate->completed && newstate->completed) return FLASH_FRAME * (max((newstate->w+1)/2, (newstate->h+1)/2)+1); @@ -1248,21 +1288,21 @@ static float game_flash_length(game_state *oldstate, game_state *newstate, return 0.0F; } -static int game_wants_statusbar(void) +static int game_status(const game_state *state) { - return TRUE; + return state->completed ? +1 : 0; } -static int game_timing_state(game_state *state, game_ui *ui) +static int game_timing_state(const game_state *state, game_ui *ui) { return TRUE; } -static void game_print_size(game_params *params, float *x, float *y) +static void game_print_size(const game_params *params, float *x, float *y) { } -static void game_print(drawing *dr, game_state *state, int tilesize) +static void game_print(drawing *dr, const game_state *state, int tilesize) { } @@ -1271,7 +1311,7 @@ static void game_print(drawing *dr, game_state *state, int tilesize) #endif const struct game thegame = { - "Flip", "games.flip", + "Flip", "games.flip", "flip", default_params, game_fetch_preset, decode_params, @@ -1286,7 +1326,7 @@ const struct game thegame = { dup_game, free_game, TRUE, solve_game, - FALSE, game_text_format, + TRUE, game_can_format_as_text_now, game_text_format, new_ui, free_ui, encode_ui, @@ -1301,8 +1341,9 @@ 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, /* mouse_priorities */ + 0, /* flags */ };