zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added an `interactive' flag to new_game_desc(), which toggles Mines

Browse Source 
between on the one hand generating indeterminate game descriptions
awaiting the initial click, and on the other hand generating
concrete ones which have had their initial click. This makes `mines
--generate' do something useful.

[originally from svn r5869]
This commit is contained in:
Simon Tatham
2005-05-30 18:41:40 +00:00
parent 3c6b77c93b
commit e4328b9081
14 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mines.c
View File

@ -1847,24 +1847,29 @@ static char *new_mine_layout(int w, int h, int n, int x, int y, int unique,
}
static char *new_game_desc(game_params *params, random_state *rs,
game_aux_info **aux)
game_aux_info **aux, int interactive)
{
#ifdef PREOPENED
int x = random_upto(rs, params->w);
int y = random_upto(rs, params->h);
char *grid, *desc;
if (!interactive) {
/*
* For batch-generated grids, pre-open one square.
*/
int x = random_upto(rs, params->w);
int y = random_upto(rs, params->h);
char *grid, *desc;
grid = new_mine_layout(params->w, params->h, params->n,
x, y, params->unique, rs);
#else
char *rsdesc, *desc;
grid = new_mine_layout(params->w, params->h, params->n,
x, y, params->unique, rs, &desc);
sfree(grid);
return desc;
} else {
char *rsdesc, *desc;
rsdesc = random_state_encode(rs);
desc = snewn(strlen(rsdesc) + 100, char);
sprintf(desc, "r%d,%c,%s", params->n, params->unique ? 'u' : 'a', rsdesc);
sfree(rsdesc);
return desc;
#endif
rsdesc = random_state_encode(rs);
desc = snewn(strlen(rsdesc) + 100, char);
sprintf(desc, "r%d,%c,%s", params->n, params->unique ? 'u' : 'a', rsdesc);
sfree(rsdesc);
return desc;
}
}
static void game_free_aux_info(game_aux_info *aux)