make_zzword() moved to initialize. Pruned unused stuff from cheat.c

diff --git a/cheat.c b/cheat.c
index 798460464d3b75d0b760155f8322fb7015b66816..bdfaa8a59b06c547612628e37ac119615156212c 100644 (file)
--- 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 <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include <time.h>
 #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 812e943e6dc69589758c19739a388f7903aa0fd1..0f81fe15cb52e79fdc2692a9e8d9d005f19c9af9 100644 (file)
--- 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 766082b13bf481d348417ffb9dc2de9b7576b8d5..2d207d86f8c1685f5ecaeb8a0df17660c21a5600 100644 (file)
--- 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]);