X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/7f89707cfefc99bd87511cb5d1f48a217c85e8fa..f0ee053c2a4a214a0e77b22462d0c42806d0462b:/midend.c diff --git a/midend.c b/midend.c index d35ad7c..070f4f3 100644 --- a/midend.c +++ b/midend.c @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include "puzzles.h" @@ -32,7 +34,7 @@ struct midend_data { char **preset_names; int npresets, presetsize; - game_params *params, *tmpparams; + game_params *params, *curparams; struct midend_state_entry *states; game_drawstate *drawstate; game_state *oldstate; @@ -66,7 +68,7 @@ midend_data *midend_new(frontend *fe, const game *ourgame) me->nstates = me->statesize = me->statepos = 0; me->states = NULL; me->params = ourgame->default_params(); - me->tmpparams = NULL; + me->curparams = NULL; me->desc = NULL; me->seedstr = NULL; me->aux_info = NULL; @@ -96,8 +98,8 @@ void midend_free(midend_data *me) if (me->aux_info) me->ourgame->free_aux_info(me->aux_info); me->ourgame->free_params(me->params); - if (me->tmpparams) - me->ourgame->free_params(me->tmpparams); + if (me->curparams) + me->ourgame->free_params(me->curparams); sfree(me); } @@ -133,14 +135,23 @@ void midend_new_game(midend_data *me) /* * Generate a new random seed. 15 digits comes to about * 48 bits, which should be more than enough. + * + * I'll avoid putting a leading zero on the number, + * just in case it confuses anybody who thinks it's + * processed as an integer rather than a string. */ char newseed[16]; int i; newseed[15] = '\0'; - for (i = 0; i < 15; i++) + newseed[0] = '1' + random_upto(me->random, 9); + for (i = 1; i < 15; i++) newseed[i] = '0' + random_upto(me->random, 10); sfree(me->seedstr); me->seedstr = dupstr(newseed); + + if (me->curparams) + me->ourgame->free_params(me->curparams); + me->curparams = me->ourgame->dup_params(me->params); } sfree(me->desc); @@ -149,14 +160,8 @@ void midend_new_game(midend_data *me) me->aux_info = NULL; rs = random_init(me->seedstr, strlen(me->seedstr)); - me->desc = me->ourgame->new_desc - (me->tmpparams ? me->tmpparams : me->params, rs, &me->aux_info); + me->desc = me->ourgame->new_desc(me->curparams, rs, &me->aux_info); random_free(rs); - - if (me->tmpparams) { - me->ourgame->free_params(me->tmpparams); - me->tmpparams = NULL; - } } ensure(me); @@ -498,6 +503,32 @@ float *midend_colours(midend_data *me, int *ncolours) ret = me->ourgame->colours(me->frontend, state, ncolours); + { + int i; + + /* + * Allow environment-based overrides for the standard + * colours by defining variables along the lines of + * `NET_COLOUR_4=6000c0'. + */ + + for (i = 0; i < *ncolours; i++) { + char buf[80], *e; + unsigned int r, g, b; + int j; + + sprintf(buf, "%s_COLOUR_%d", me->ourgame->name, i); + for (j = 0; buf[j]; j++) + buf[j] = toupper((unsigned char)buf[j]); + if ((e = getenv(buf)) != NULL && + sscanf(e, "%2x%2x%2x", &r, &g, &b) == 3) { + ret[i*3 + 0] = r / 255.0; + ret[i*3 + 1] = g / 255.0; + ret[i*3 + 2] = b / 255.0; + } + } + } + if (me->nstates == 0) me->ourgame->free_game(state); @@ -525,6 +556,59 @@ int midend_num_presets(midend_data *me) } } + { + /* + * Allow environment-based extensions to the preset list by + * defining a variable along the lines of `SOLO_PRESETS=2x3 + * Advanced:2x3da'. Colon-separated list of items, + * alternating between textual titles in the menu and + * encoded parameter strings. + */ + char buf[80], *e, *p; + int j; + + sprintf(buf, "%s_PRESETS", me->ourgame->name); + for (j = 0; buf[j]; j++) + buf[j] = toupper((unsigned char)buf[j]); + + if ((e = getenv(buf)) != NULL) { + p = e = dupstr(e); + + while (*p) { + char *name, *val; + game_params *preset; + + name = p; + while (*p && *p != ':') p++; + if (*p) *p++ = '\0'; + val = p; + while (*p && *p != ':') p++; + if (*p) *p++ = '\0'; + + preset = me->ourgame->default_params(); + me->ourgame->decode_params(preset, val); + + if (me->ourgame->validate_params(preset)) { + /* Drop this one from the list. */ + me->ourgame->free_params(preset); + continue; + } + + if (me->presetsize <= me->npresets) { + me->presetsize = me->npresets + 10; + me->presets = sresize(me->presets, me->presetsize, + game_params *); + me->preset_names = sresize(me->preset_names, + me->presetsize, char *); + } + + me->presets[me->npresets] = preset; + me->preset_names[me->npresets] = name; + me->npresets++; + } + } + } + return me->npresets; } @@ -576,7 +660,7 @@ config_item *midend_get_config(midend_data *me, int which, char **wintitle) * the former is likely to persist across many code * changes). */ - parstr = me->ourgame->encode_params(me->params, which == CFG_SEED); + parstr = me->ourgame->encode_params(me->curparams, which == CFG_SEED); if (which == CFG_DESC) { ret[0].sval = snewn(strlen(parstr) + strlen(me->desc) + 2, char); sprintf(ret[0].sval, "%s:%s", parstr, me->desc); @@ -656,9 +740,9 @@ static char *midend_game_id_int(midend_data *me, char *id, int defmode) me->ourgame->free_params(tmpparams); return error; } - if (me->tmpparams) - me->ourgame->free_params(me->tmpparams); - me->tmpparams = tmpparams; + if (me->curparams) + me->ourgame->free_params(me->curparams); + me->curparams = tmpparams; /* * Now filter only the persistent parts of this state into @@ -669,18 +753,23 @@ static char *midend_game_id_int(midend_data *me, char *id, int defmode) if (seed || desc) { char *tmpstr = me->ourgame->encode_params(tmpparams, FALSE); me->ourgame->decode_params(me->params, tmpstr); + sfree(tmpstr); } else { me->ourgame->free_params(me->params); me->params = me->ourgame->dup_params(tmpparams); } } + sfree(me->desc); + me->desc = NULL; + sfree(me->seedstr); + me->seedstr = NULL; + if (desc) { error = me->ourgame->validate_desc(me->params, desc); if (error) return error; - sfree(me->desc); me->desc = dupstr(desc); me->genmode = GOT_DESC; if (me->aux_info) @@ -689,7 +778,6 @@ static char *midend_game_id_int(midend_data *me, char *id, int defmode) } if (seed) { - sfree(me->seedstr); me->seedstr = dupstr(seed); me->genmode = GOT_SEED; }