mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-21 16:05:44 -07:00
The other day I found it useful for a (silly) special purpose to
generate a thousand saved-game files of randomly generated puzzles. On the general principle that if I find it useful someone else conceivably might too, add a --save option to the Unix puzzle binaries, for use with --generate in much the same way as --print. [originally from svn r8351]
This commit is contained in:
59
gtk.c
59
gtk.c
@ -1337,7 +1337,7 @@ static void savefile_write(void *wctx, void *buf, int len)
|
|||||||
{
|
{
|
||||||
struct savefile_write_ctx *ctx = (struct savefile_write_ctx *)wctx;
|
struct savefile_write_ctx *ctx = (struct savefile_write_ctx *)wctx;
|
||||||
if (fwrite(buf, 1, len, ctx->fp) < len)
|
if (fwrite(buf, 1, len, ctx->fp) < len)
|
||||||
ctx->error = 1;
|
ctx->error = errno;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int savefile_read(void *wctx, void *buf, int len)
|
static int savefile_read(void *wctx, void *buf, int len)
|
||||||
@ -1386,7 +1386,10 @@ static void menu_save_event(GtkMenuItem *menuitem, gpointer data)
|
|||||||
midend_serialise(fe->me, savefile_write, &ctx);
|
midend_serialise(fe->me, savefile_write, &ctx);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
if (ctx.error) {
|
if (ctx.error) {
|
||||||
error_box(fe->window, "Error writing save file");
|
char boxmsg[512];
|
||||||
|
sprintf(boxmsg, "Error writing save file: %.400s",
|
||||||
|
strerror(errno));
|
||||||
|
error_box(fe->window, boxmsg);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1910,6 +1913,7 @@ int main(int argc, char **argv)
|
|||||||
int soln = FALSE, colour = FALSE;
|
int soln = FALSE, colour = FALSE;
|
||||||
float scale = 1.0F;
|
float scale = 1.0F;
|
||||||
float redo_proportion = 0.0F;
|
float redo_proportion = 0.0F;
|
||||||
|
char *savefile = NULL, *savesuffix = NULL;
|
||||||
char *arg = NULL;
|
char *arg = NULL;
|
||||||
int argtype = ARG_EITHER;
|
int argtype = ARG_EITHER;
|
||||||
char *screenshot_file = NULL;
|
char *screenshot_file = NULL;
|
||||||
@ -1958,6 +1962,23 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
ngenerate = 1;
|
ngenerate = 1;
|
||||||
|
} else if (doing_opts && !strcmp(p, "--save")) {
|
||||||
|
if (--ac > 0) {
|
||||||
|
savefile = *++av;
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, "%s: '--save' expected a filename\n",
|
||||||
|
pname);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
} else if (doing_opts && (!strcmp(p, "--save-suffix") ||
|
||||||
|
!strcmp(p, "--savesuffix"))) {
|
||||||
|
if (--ac > 0) {
|
||||||
|
savesuffix = *++av;
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, "%s: '--save-suffix' expected a filename\n",
|
||||||
|
pname);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
} else if (doing_opts && !strcmp(p, "--print")) {
|
} else if (doing_opts && !strcmp(p, "--print")) {
|
||||||
if (!thegame.can_print) {
|
if (!thegame.can_print) {
|
||||||
fprintf(stderr, "%s: this game does not support printing\n",
|
fprintf(stderr, "%s: this game does not support printing\n",
|
||||||
@ -2088,7 +2109,7 @@ int main(int argc, char **argv)
|
|||||||
* you may specify it to be 1). Sorry; that was the
|
* you may specify it to be 1). Sorry; that was the
|
||||||
* simplest-to-parse command-line syntax I came up with.
|
* simplest-to-parse command-line syntax I came up with.
|
||||||
*/
|
*/
|
||||||
if (ngenerate > 0 || print) {
|
if (ngenerate > 0 || print || savefile || savesuffix) {
|
||||||
int i, n = 1;
|
int i, n = 1;
|
||||||
midend *me;
|
midend *me;
|
||||||
char *id;
|
char *id;
|
||||||
@ -2099,6 +2120,11 @@ int main(int argc, char **argv)
|
|||||||
me = midend_new(NULL, &thegame, NULL, NULL);
|
me = midend_new(NULL, &thegame, NULL, NULL);
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|
||||||
|
if (savefile && !savesuffix)
|
||||||
|
savesuffix = "";
|
||||||
|
if (!savefile && savesuffix)
|
||||||
|
savefile = "";
|
||||||
|
|
||||||
if (print)
|
if (print)
|
||||||
doc = document_new(px, py, scale);
|
doc = document_new(px, py, scale);
|
||||||
|
|
||||||
@ -2155,7 +2181,32 @@ int main(int argc, char **argv)
|
|||||||
fprintf(stderr, "%s: error in printing: %s\n", pname, err);
|
fprintf(stderr, "%s: error in printing: %s\n", pname, err);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
if (savefile) {
|
||||||
|
struct savefile_write_ctx ctx;
|
||||||
|
char *realname = snewn(40 + strlen(savefile) +
|
||||||
|
strlen(savesuffix), char);
|
||||||
|
sprintf(realname, "%s%d%s", savefile, i, savesuffix);
|
||||||
|
ctx.fp = fopen(realname, "w");
|
||||||
|
if (!ctx.fp) {
|
||||||
|
fprintf(stderr, "%s: open: %s\n", realname,
|
||||||
|
strerror(errno));
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
sfree(realname);
|
||||||
|
midend_serialise(me, savefile_write, &ctx);
|
||||||
|
if (ctx.error) {
|
||||||
|
fprintf(stderr, "%s: write: %s\n", realname,
|
||||||
|
strerror(ctx.error));
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (fclose(ctx.fp)) {
|
||||||
|
fprintf(stderr, "%s: close: %s\n", realname,
|
||||||
|
strerror(errno));
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!doc && !savefile) {
|
||||||
id = midend_get_game_id(me);
|
id = midend_get_game_id(me);
|
||||||
puts(id);
|
puts(id);
|
||||||
sfree(id);
|
sfree(id);
|
||||||
|
23
puzzles.but
23
puzzles.but
@ -368,6 +368,29 @@ There are various other options which affect printing; see below.
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
\dt \cw{--save }\e{file-prefix} [ \cw{--save-suffix }\e{file-suffix} ]
|
||||||
|
|
||||||
|
\dd If this option is specified, instead of a puzzle being
|
||||||
|
displayed, saved-game files for one or more unsolved puzzles are
|
||||||
|
written to files constructed from the supplied prefix and/or suffix.
|
||||||
|
|
||||||
|
\lcont{
|
||||||
|
|
||||||
|
If \c{--generate} has also been specified, the invented game IDs will
|
||||||
|
be used to generate the printed output. Otherwise, a list of game IDs
|
||||||
|
is expected on standard input (which can be descriptive or random
|
||||||
|
seeds; see \k{common-id}), in the same format produced by
|
||||||
|
\c{--generate}.
|
||||||
|
|
||||||
|
For example:
|
||||||
|
|
||||||
|
\c net --generate 12 --save game --save-suffix .sav
|
||||||
|
|
||||||
|
will generate twelve Net saved-game files with the names
|
||||||
|
\cw{game0.sav} to \cw{game11.sav}.
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
\dt \cw{--version}
|
\dt \cw{--version}
|
||||||
|
|
||||||
\dd Prints version information about the game, and then quits.
|
\dd Prints version information about the game, and then quits.
|
||||||
|
Reference in New Issue
Block a user