From: Aaron Traas Date: Sun, 2 Jul 2017 05:07:53 +0000 (-0400) Subject: make_zzword() moved to initialize. Pruned unused stuff from cheat.c X-Git-Tag: takebird~127 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=f815299a2a97656b0f4ea0793c2207c2437888f6;p=open-adventure.git make_zzword() moved to initialize. Pruned unused stuff from cheat.c --- diff --git a/cheat.c b/cheat.c index 7984604..bdfaa8a 100644 --- a/cheat.c +++ b/cheat.c @@ -1,12 +1,16 @@ +/* + * 'cheat' is a tool for generating save game files to test states that ought + * not happen. It leverages chunks of advent, mostly initialize() and + * savefile(), so we know we're always outputing save files that advent + * can import. + */ #include #include #include #include -#include #include "advent.h" -#include "dungeon.h" -FILE *logfp = NULL, *rfp = NULL; +FILE *logfp = NULL; bool oldstyle = false; bool prompt = true; @@ -17,6 +21,7 @@ int main(int argc, char *argv[]) long numdie = 0; long saved = 1; long version = 0; + FILE *fp = NULL; /* Options. */ const char* opts = "d:s:v:o:"; @@ -51,6 +56,7 @@ int main(int argc, char *argv[]) } } + // Save filename required; the point of cheat is to generate save file if (savefilename == NULL) { fprintf(stderr, usage, argv[0]); @@ -59,13 +65,9 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - FILE *fp = NULL; - - /* Initialize game variables */ + // Initialize game variables initialise(); - make_zzword(game.zzword); - // apply cheats game.numdie = numdie; game.saved = saved; @@ -80,5 +82,6 @@ int main(int argc, char *argv[]) savefile(fp, version); printf("cheat: %s created.\n", savefilename); - return 0; + + return EXIT_SUCCESS; } diff --git a/init.c b/init.c index 812e943..0f81fe1 100644 --- a/init.c +++ b/init.c @@ -92,5 +92,8 @@ long initialise(void) } game.conds = setbit(11); + /* Start-up, dwarf stuff */ + make_zzword(game.zzword); + return seedval; } diff --git a/main.c b/main.c index 766082b..2d207d8 100644 --- a/main.c +++ b/main.c @@ -110,9 +110,6 @@ int main(int argc, char *argv[]) /* Initialize game variables */ long seedval = initialise(); - /* Start-up, dwarf stuff */ - make_zzword(game.zzword); - #ifndef ADVENT_NOSAVE if (!rfp) { game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]);