struct midend_data {
frontend *frontend;
random_state *random;
+ const game *ourgame;
char *seed;
int fresh_seed;
game_ui *ui;
float anim_time, anim_pos;
float flash_time, flash_pos;
+ int dir;
};
#define ensure(me) do { \
} \
} while (0)
-midend_data *midend_new(frontend *fe, void *randseed, int randseedsize)
+midend_data *midend_new(frontend *fe, const game *ourgame)
{
midend_data *me = snew(midend_data);
+ void *randseed;
+ int randseedsize;
+
+ get_random_seed(&randseed, &randseedsize);
me->frontend = fe;
+ me->ourgame = ourgame;
me->random = random_init(randseed, randseedsize);
me->nstates = me->statesize = me->statepos = 0;
me->states = NULL;
- me->params = default_params();
+ me->params = ourgame->default_params();
me->seed = NULL;
me->fresh_seed = FALSE;
me->drawstate = NULL;
me->npresets = me->presetsize = 0;
me->anim_time = me->anim_pos = 0.0F;
me->flash_time = me->flash_pos = 0.0F;
+ me->dir = 0;
me->ui = NULL;
+ sfree(randseed);
+
return me;
}
{
sfree(me->states);
sfree(me->seed);
- free_params(me->params);
+ me->ourgame->free_params(me->params);
sfree(me);
}
void midend_size(midend_data *me, int *x, int *y)
{
- game_size(me->params, x, y);
+ me->ourgame->size(me->params, x, y);
}
void midend_set_params(midend_data *me, game_params *params)
{
- free_params(me->params);
- me->params = dup_params(params);
+ me->ourgame->free_params(me->params);
+ me->params = me->ourgame->dup_params(params);
}
void midend_new_game(midend_data *me)
{
while (me->nstates > 0)
- free_game(me->states[--me->nstates]);
+ me->ourgame->free_game(me->states[--me->nstates]);
if (me->drawstate)
- game_free_drawstate(me->drawstate);
+ me->ourgame->free_drawstate(me->drawstate);
assert(me->nstates == 0);
if (!me->fresh_seed) {
sfree(me->seed);
- me->seed = new_game_seed(me->params, me->random);
+ me->seed = me->ourgame->new_seed(me->params, me->random);
} else
me->fresh_seed = FALSE;
ensure(me);
- me->states[me->nstates++] = new_game(me->params, me->seed);
+ me->states[me->nstates++] = me->ourgame->new_game(me->params, me->seed);
me->statepos = 1;
- me->drawstate = game_new_drawstate(me->states[0]);
+ me->drawstate = me->ourgame->new_drawstate(me->states[0]);
if (me->ui)
- free_ui(me->ui);
- me->ui = new_ui(me->states[0]);
+ me->ourgame->free_ui(me->ui);
+ me->ui = me->ourgame->new_ui(me->states[0]);
}
void midend_restart_game(midend_data *me)
{
while (me->nstates > 1)
- free_game(me->states[--me->nstates]);
+ me->ourgame->free_game(me->states[--me->nstates]);
me->statepos = me->nstates;
- free_ui(me->ui);
- me->ui = new_ui(me->states[0]);
+ me->ourgame->free_ui(me->ui);
+ me->ui = me->ourgame->new_ui(me->states[0]);
}
static int midend_undo(midend_data *me)
{
if (me->statepos > 1) {
me->statepos--;
+ me->dir = -1;
return 1;
} else
return 0;
{
if (me->statepos < me->nstates) {
me->statepos++;
+ me->dir = +1;
return 1;
} else
return 0;
float flashtime;
if (me->oldstate || me->statepos > 1) {
- flashtime = game_flash_length(me->oldstate ? me->oldstate :
- me->states[me->statepos-2],
- me->states[me->statepos-1]);
+ flashtime = me->ourgame->flash_length(me->oldstate ? me->oldstate :
+ me->states[me->statepos-2],
+ me->states[me->statepos-1],
+ me->oldstate ? me->dir : +1);
if (flashtime > 0) {
me->flash_pos = 0.0F;
me->flash_time = flashtime;
}
if (me->oldstate)
- free_game(me->oldstate);
+ me->ourgame->free_game(me->oldstate);
me->oldstate = NULL;
me->anim_pos = me->anim_time = 0;
+ me->dir = 0;
if (me->flash_time == 0 && me->anim_time == 0)
deactivate_timer(me->frontend);
int midend_process_key(midend_data *me, int x, int y, int button)
{
- game_state *oldstate = dup_game(me->states[me->statepos - 1]);
+ game_state *oldstate = me->ourgame->dup_game(me->states[me->statepos - 1]);
float anim_time;
if (button == 'n' || button == 'N' || button == '\x0E') {
if (!midend_redo(me))
return 1;
} else if (button == 'q' || button == 'Q' || button == '\x11') {
- free_game(oldstate);
+ me->ourgame->free_game(oldstate);
return 0;
} else {
- game_state *s = make_move(me->states[me->statepos-1], me->ui,
- x, y, button);
+ game_state *s = me->ourgame->make_move(me->states[me->statepos-1],
+ me->ui, x, y, button);
if (s == me->states[me->statepos-1]) {
/*
} else if (s) {
midend_stop_anim(me);
while (me->nstates > me->statepos)
- free_game(me->states[--me->nstates]);
+ me->ourgame->free_game(me->states[--me->nstates]);
ensure(me);
me->states[me->nstates] = s;
me->statepos = ++me->nstates;
+ me->dir = +1;
} else {
- free_game(oldstate);
+ me->ourgame->free_game(oldstate);
return 1;
}
}
/*
* See if this move requires an animation.
*/
- anim_time = game_anim_length(oldstate, me->states[me->statepos-1]);
+ anim_time = me->ourgame->anim_length(oldstate, me->states[me->statepos-1],
+ me->dir);
me->oldstate = oldstate;
if (anim_time > 0) {
start_draw(me->frontend);
if (me->oldstate && me->anim_time > 0 &&
me->anim_pos < me->anim_time) {
- game_redraw(me->frontend, me->drawstate, me->oldstate,
- me->states[me->statepos-1], me->ui, me->anim_pos,
- me->flash_pos);
+ assert(me->dir != 0);
+ me->ourgame->redraw(me->frontend, me->drawstate, me->oldstate,
+ me->states[me->statepos-1], me->dir,
+ me->ui, me->anim_pos, me->flash_pos);
} else {
- game_redraw(me->frontend, me->drawstate, NULL,
- me->states[me->statepos-1], me->ui, 0.0,
- me->flash_pos);
+ me->ourgame->redraw(me->frontend, me->drawstate, NULL,
+ me->states[me->statepos-1], +1 /*shrug*/,
+ me->ui, 0.0, me->flash_pos);
}
end_draw(me->frontend);
}
float *ret;
if (me->nstates == 0) {
- char *seed = new_game_seed(me->params, me->random);
- state = new_game(me->params, seed);
+ char *seed = me->ourgame->new_seed(me->params, me->random);
+ state = me->ourgame->new_game(me->params, seed);
sfree(seed);
} else
state = me->states[0];
- ret = game_colours(me->frontend, state, ncolours);
+ ret = me->ourgame->colours(me->frontend, state, ncolours);
if (me->nstates == 0)
- free_game(state);
+ me->ourgame->free_game(state);
return ret;
}
char *name;
game_params *preset;
- while (game_fetch_preset(me->npresets, &name, &preset)) {
+ while (me->ourgame->fetch_preset(me->npresets, &name, &preset)) {
if (me->presetsize <= me->npresets) {
me->presetsize = me->npresets + 10;
me->presets = sresize(me->presets, me->presetsize,
int midend_wants_statusbar(midend_data *me)
{
- return game_wants_statusbar();
+ return me->ourgame->wants_statusbar();
}
config_item *midend_get_config(midend_data *me, int which, char **wintitle)
char *titlebuf, *parstr;
config_item *ret;
- titlebuf = snewn(40 + strlen(game_name), char);
+ titlebuf = snewn(40 + strlen(me->ourgame->name), char);
switch (which) {
case CFG_SETTINGS:
- sprintf(titlebuf, "%s configuration", game_name);
+ sprintf(titlebuf, "%s configuration", me->ourgame->name);
*wintitle = dupstr(titlebuf);
- return game_configure(me->params);
+ return me->ourgame->configure(me->params);
case CFG_SEED:
- sprintf(titlebuf, "%s game selection", game_name);
+ sprintf(titlebuf, "%s game selection", me->ourgame->name);
*wintitle = dupstr(titlebuf);
ret = snewn(2, config_item);
* parameters, plus a colon, plus the game seed. This is a
* full game ID.
*/
- parstr = encode_params(me->params);
+ parstr = me->ourgame->encode_params(me->params);
ret[0].sval = snewn(strlen(parstr) + strlen(me->seed) + 2, char);
sprintf(ret[0].sval, "%s:%s", parstr, me->seed);
sfree(parstr);
return NULL;
}
+char *midend_game_id(midend_data *me, char *id, int def_seed)
+{
+ char *error, *par, *seed;
+ game_params *params;
+
+ seed = strchr(id, ':');
+
+ if (seed) {
+ /*
+ * We have a colon separating parameters from game seed. So
+ * `par' now points to the parameters string, and `seed' to
+ * the seed string.
+ */
+ *seed++ = '\0';
+ par = id;
+ } else {
+ /*
+ * We only have one string. Depending on `def_seed', we
+ * take it to be either parameters or seed.
+ */
+ if (def_seed) {
+ seed = id;
+ par = NULL;
+ } else {
+ seed = NULL;
+ par = id;
+ }
+ }
+
+ if (par) {
+ params = me->ourgame->decode_params(par);
+ error = me->ourgame->validate_params(params);
+ if (error) {
+ me->ourgame->free_params(params);
+ return error;
+ }
+ me->ourgame->free_params(me->params);
+ me->params = params;
+ }
+
+ if (seed) {
+ error = me->ourgame->validate_seed(me->params, seed);
+ if (error)
+ return error;
+
+ sfree(me->seed);
+ me->seed = dupstr(seed);
+ me->fresh_seed = TRUE;
+ }
+
+ return NULL;
+}
+
char *midend_set_config(midend_data *me, int which, config_item *cfg)
{
- char *error, *p;
+ char *error;
game_params *params;
switch (which) {
case CFG_SETTINGS:
- params = custom_params(cfg);
- error = validate_params(params);
+ params = me->ourgame->custom_params(cfg);
+ error = me->ourgame->validate_params(params);
if (error) {
- free_params(params);
+ me->ourgame->free_params(params);
return error;
}
- free_params(me->params);
+ me->ourgame->free_params(me->params);
me->params = params;
break;
case CFG_SEED:
-
- /*
- * The game ID will often (in fact, mostly) have a prefix
- * containing a string-encoded parameter specification
- * followed by a colon. So first find the colon, and then
- * split the string up.
- */
- p = strchr(cfg[0].sval, ':');
-
- if (p) {
- *p++ = '\0'; /* p now points to game seed */
- params = decode_params(cfg[0].sval);
- error = validate_params(params);
- if (error) {
- free_params(params);
- return error;
- }
- free_params(me->params);
- me->params = params;
- } else
- p = cfg[0].sval;
-
- error = validate_seed(me->params, p);
+ error = midend_game_id(me, cfg[0].sval, TRUE);
if (error)
return error;
-
- sfree(me->seed);
- me->seed = dupstr(p);
- me->fresh_seed = TRUE;
-
break;
}
~mdw / sgt / puzzles / blobdiff