Allow cheat to generate save files with bogus numbers.

Also remove pre-built save file for resumefail.log
This commit is contained in:
Aaron Traas 2017-06-27 10:46:26 -04:00 committed by Eric S. Raymond
parent 7392603b7d
commit 0a30176a8c
6 changed files with 22 additions and 11 deletions

View file

@ -127,7 +127,7 @@ extern unsigned long get_next_lcg_value(void);
extern long randrange(long); extern long randrange(long);
extern long score(enum termination); extern long score(enum termination);
extern void terminate(enum termination) __attribute__((noreturn)); extern void terminate(enum termination) __attribute__((noreturn));
extern int savefile(FILE *); extern int savefile(FILE *, long);
extern int suspend(void); extern int suspend(void);
extern int resume(void); extern int resume(void);
extern int restore(FILE *); extern int restore(FILE *);

16
cheat.c
View file

@ -25,10 +25,11 @@ int main(int argc, char *argv[])
char *savefilename = NULL; char *savefilename = NULL;
long numdie = 0; long numdie = 0;
long saved = 1; long saved = 1;
long version = 0;
/* Options. */ /* Options. */
const char* opts = "d:s:o:"; const char* opts = "d:s:v:o:";
const char* usage = "Usage: %s [-d numdie] [-s numsaves] -o savefilename \n"; const char* usage = "Usage: %s [-d numdie] [-s numsaves] [-v version] -o savefilename \n";
while ((ch = getopt(argc, argv, opts)) != EOF) { while ((ch = getopt(argc, argv, opts)) != EOF) {
switch (ch) { switch (ch) {
case 'd': case 'd':
@ -37,6 +38,9 @@ int main(int argc, char *argv[])
case 's': case 's':
saved = (long)atoi(optarg); saved = (long)atoi(optarg);
break; break;
case 'v':
version = (long)atoi(optarg);;
break;
case 'o': case 'o':
savefilename = optarg; savefilename = optarg;
break; break;
@ -47,6 +51,8 @@ int main(int argc, char *argv[])
" -d number of deaths. Signed integer value.'\n"); " -d number of deaths. Signed integer value.'\n");
fprintf(stderr, fprintf(stderr,
" -s number of saves. Signed integer value.\n"); " -s number of saves. Signed integer value.\n");
fprintf(stderr,
" -v version number of save format.\n");
fprintf(stderr, fprintf(stderr,
" -o file name of save game to write.\n"); " -o file name of save game to write.\n");
exit(-1); exit(-1);
@ -87,11 +93,13 @@ int main(int argc, char *argv[])
fp = fopen(savefilename, WRITE_MODE); fp = fopen(savefilename, WRITE_MODE);
if (fp == NULL) if (fp == NULL)
{ {
printf("Can't open file %s. Exiting.\n", savefilename); fprintf(stderr,
"Can't open file %s. Exiting.\n", savefilename);
exit(-1); exit(-1);
} }
savefile(fp); savefile(fp, version);
printf("cheat: %s created.\n", savefilename); printf("cheat: %s created.\n", savefilename);
return 0; return 0;
} }

View file

@ -27,7 +27,7 @@ struct save_t {
}; };
struct save_t save; struct save_t save;
int savefile(FILE *fp) int savefile(FILE *fp, long version)
/* Save game to file. No input or output from user. */ /* Save game to file. No input or output from user. */
{ {
long i, k; long i, k;
@ -35,7 +35,9 @@ int savefile(FILE *fp)
k = i + 650 * k; k = i + 650 * k;
save.savetime = k; save.savetime = k;
save.mode = -1; save.mode = -1;
save.version = VRSION;
save.version = (version == 0) ? VRSION : version;
memcpy(&save.game, &game, sizeof(struct game_t)); memcpy(&save.game, &game, sizeof(struct game_t));
IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp)); IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
return(0); return(0);
@ -68,8 +70,7 @@ int suspend(void)
linenoiseFree(name); linenoiseFree(name);
} }
savefile(fp); savefile(fp, VRSION);
IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
fclose(fp); fclose(fp);
rspeak(RESUME_HELP); rspeak(RESUME_HELP);
exit(0); exit(0);

View file

@ -37,8 +37,10 @@ buildregress:
done; \ done; \
rm -f scratch.tmp rm -f scratch.tmp
regress: regress:
$(ECHO) -n "Generate cheat file: " $(ECHO) -n "Generate save file with -1000 deaths: "
../cheat -d -1000 -o cheat_numdie.adv ../cheat -d -1000 -o cheat_numdie.adv
$(ECHO) -n "Generate save file with version -1337: "
../cheat -v -1337 -o resume_badversion.adv
@for file in $(TESTLOADS); do \ @for file in $(TESTLOADS); do \
$(ECHO) -n " $${file} "; grep '##' $${file}.log || echo ' ## (no description)'; \ $(ECHO) -n " $${file} "; grep '##' $${file}.log || echo ' ## (no description)'; \
OPTS=`sed -n /#options:/s///p <$${file}.log`; \ OPTS=`sed -n /#options:/s///p <$${file}.log`; \

Binary file not shown.

View file

@ -3,4 +3,4 @@ n
seed 1240742801 seed 1240742801
resume resume
y y
resume_badversion.testsave resume_badversion.adv