}
static char *new_game_desc(game_params *params, random_state *rs,
- game_aux_info **aux, int interactive)
+ char **aux, int interactive)
{
int w = params->w, h = params->h, wh = w * h;
int i, j;
return ret;
}
-static void game_free_aux_info(game_aux_info *aux)
-{
- assert(!"Shouldn't happen");
-}
-
static char *validate_desc(game_params *params, char *desc)
{
int w = params->w, h = params->h, wh = w * h;
row1[i] ^= row2[i];
}
-static game_state *solve_game(game_state *state, game_state *currstate,
- game_aux_info *aux, char **error)
+static char *solve_game(game_state *state, game_state *currstate,
+ char *aux, char **error)
{
int w = state->w, h = state->h, wh = w * h;
unsigned char *equations, *solution, *shortest;
int *und, nund;
int rowsdone, colsdone;
int i, j, k, len, bestlen;
- game_state *ret;
+ char *ret;
/*
* Set up a list of simultaneous equations. Each one is of
}
/*
- * We have a solution. Produce a game state with the solution
- * marked in annotations.
+ * We have a solution. Produce a move string encoding the
+ * solution.
*/
- ret = dup_game(currstate);
- ret->hints_active = TRUE;
- ret->cheated = TRUE;
- for (i = 0; i < wh; i++) {
- ret->grid[i] &= ~2;
- if (shortest[i])
- ret->grid[i] |= 2;
- }
+ ret = snewn(wh + 2, char);
+ ret[0] = 'S';
+ for (i = 0; i < wh; i++)
+ ret[i+1] = shortest[i] ? '1' : '0';
+ ret[wh+1] = '\0';
sfree(shortest);
sfree(solution);
{
}
+static char *encode_ui(game_ui *ui)
+{
+ return NULL;
+}
+
+static void decode_ui(game_ui *ui, char *encoding)
+{
+}
+
static void game_changed_state(game_ui *ui, game_state *oldstate,
game_state *newstate)
{
int tilesize;
};
-static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds,
- int x, int y, int button)
+static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
+ int x, int y, int button)
{
- int w = from->w, h = from->h, wh = w * h;
- game_state *ret;
+ int w = state->w, h = state->h /*, wh = w * h */;
+ char buf[80];
if (button == LEFT_BUTTON) {
int tx = FROMCOORD(x), ty = FROMCOORD(y);
if (tx >= 0 && tx < w && ty >= 0 && ty < h) {
- int i, j, done;
+ sprintf(buf, "M%d,%d", tx, ty);
+ return dupstr(buf);
+ }
+ }
- ret = dup_game(from);
+ return NULL;
+}
- if (!ret->completed)
- ret->moves++;
+static game_state *execute_move(game_state *from, char *move)
+{
+ int w = from->w, h = from->h, wh = w * h;
+ game_state *ret;
+ int x, y;
+
+ if (move[0] == 'S' && strlen(move) == wh+1) {
+ int i;
+
+ ret = dup_game(from);
+ ret->hints_active = TRUE;
+ ret->cheated = TRUE;
+ for (i = 0; i < wh; i++) {
+ ret->grid[i] &= ~2;
+ if (move[i+1] != '0')
+ ret->grid[i] |= 2;
+ }
+ return ret;
+ } else if (move[0] == 'M' &&
+ sscanf(move+1, "%d,%d", &x, &y) == 2 &&
+ x >= 0 && x < w && y >= 0 && y < h) {
+ int i, j, done;
- i = ty * w + tx;
+ ret = dup_game(from);
- done = TRUE;
- for (j = 0; j < wh; j++) {
- ret->grid[j] ^= ret->matrix->matrix[i*wh+j];
- if (ret->grid[j] & 1)
- done = FALSE;
- }
- ret->grid[i] ^= 2; /* toggle hint */
- if (done) {
- ret->completed = TRUE;
- ret->hints_active = FALSE;
- }
+ if (!ret->completed)
+ ret->moves++;
- return ret;
- }
- }
+ i = y * w + x;
- return NULL;
+ done = TRUE;
+ for (j = 0; j < wh; j++) {
+ ret->grid[j] ^= ret->matrix->matrix[i*wh+j];
+ if (ret->grid[j] & 1)
+ done = FALSE;
+ }
+ ret->grid[i] ^= 2; /* toggle hint */
+ if (done) {
+ ret->completed = TRUE;
+ ret->hints_active = FALSE;
+ }
+
+ return ret;
+ } else
+ return NULL; /* can't parse move string */
}
/* ----------------------------------------------------------------------
static void game_size(game_params *params, game_drawstate *ds,
int *x, int *y, int expand)
{
- int tsx, tsy, ts;
+ double tsx, tsy, ts;
/*
* Each window dimension equals the tile size times one more
* than the grid dimension (the border is half the width of the
* tiles).
*/
- tsx = *x / (params->w + 1);
- tsy = *y / (params->h + 1);
+ tsx = (double)*x / ((double)params->w + 1.0);
+ tsy = (double)*y / ((double)params->h + 1);
ts = min(tsx, tsy);
if (expand)
- ds->tilesize = ts;
+ ds->tilesize = (int)(ts + 0.5);
else
- ds->tilesize = min(ts, PREFERRED_TILE_SIZE);
+ ds->tilesize = min((int)ts, PREFERRED_TILE_SIZE);
*x = TILE_SIZE * params->w + 2 * BORDER;
*y = TILE_SIZE * params->h + 2 * BORDER;
#endif
const struct game thegame = {
- "Flip", NULL,
+ "Flip", "games.flip",
default_params,
game_fetch_preset,
decode_params,
TRUE, game_configure, custom_params,
validate_params,
new_game_desc,
- game_free_aux_info,
validate_desc,
new_game,
dup_game,
FALSE, game_text_format,
new_ui,
free_ui,
+ encode_ui,
+ decode_ui,
game_changed_state,
- make_move,
+ interpret_move,
+ execute_move,
game_size,
game_colours,
game_new_drawstate,