}
static const struct {
- char *name;
+ const char *name;
game_params params;
} guess_presets[] = {
{"Standard", {6, 4, 10, FALSE, TRUE}},
ret[0].name = "Colours";
ret[0].type = C_STRING;
sprintf(buf, "%d", params->ncolours);
- ret[0].sval = dupstr(buf);
- ret[0].ival = 0;
+ ret[0].u.string.sval = dupstr(buf);
ret[1].name = "Pegs per guess";
ret[1].type = C_STRING;
sprintf(buf, "%d", params->npegs);
- ret[1].sval = dupstr(buf);
- ret[1].ival = 0;
+ ret[1].u.string.sval = dupstr(buf);
ret[2].name = "Guesses";
ret[2].type = C_STRING;
sprintf(buf, "%d", params->nguesses);
- ret[2].sval = dupstr(buf);
- ret[2].ival = 0;
+ ret[2].u.string.sval = dupstr(buf);
ret[3].name = "Allow blanks";
ret[3].type = C_BOOLEAN;
- ret[3].sval = NULL;
- ret[3].ival = params->allow_blank;
+ ret[3].u.boolean.bval = params->allow_blank;
ret[4].name = "Allow duplicates";
ret[4].type = C_BOOLEAN;
- ret[4].sval = NULL;
- ret[4].ival = params->allow_multiple;
+ ret[4].u.boolean.bval = params->allow_multiple;
ret[5].name = NULL;
ret[5].type = C_END;
- ret[5].sval = NULL;
- ret[5].ival = 0;
return ret;
}
{
game_params *ret = snew(game_params);
- ret->ncolours = atoi(cfg[0].sval);
- ret->npegs = atoi(cfg[1].sval);
- ret->nguesses = atoi(cfg[2].sval);
+ ret->ncolours = atoi(cfg[0].u.string.sval);
+ ret->npegs = atoi(cfg[1].u.string.sval);
+ ret->nguesses = atoi(cfg[2].u.string.sval);
- ret->allow_blank = cfg[3].ival;
- ret->allow_multiple = cfg[4].ival;
+ ret->allow_blank = cfg[3].u.boolean.bval;
+ ret->allow_multiple = cfg[4].u.boolean.bval;
return ret;
}
-static char *validate_params(const game_params *params, int full)
+static const char *validate_params(const game_params *params, int full)
{
if (params->ncolours < 2 || params->npegs < 2)
return "Trivial solutions are uninteresting";
return ret;
}
-static char *validate_desc(const game_params *params, const char *desc)
+static const char *validate_desc(const game_params *params, const char *desc)
{
unsigned char *bmp;
int i;
}
static char *solve_game(const game_state *state, const game_state *currstate,
- const char *aux, char **error)
+ const char *aux, const char **error)
{
return dupstr("S");
}
static char *encode_ui(const game_ui *ui)
{
- char *ret, *p, *sep;
+ char *ret, *p;
+ const char *sep;
int i;
/*
static char *encode_move(const game_state *from, game_ui *ui)
{
- char *buf, *p, *sep;
+ char *buf, *p;
+ const char *sep;
int len, i;
len = ui->curr_pegs->npegs * 20 + 2;