Various cleanups.

[open-adventure.git] / cheat.c

diff --git a/cheat.c b/cheat.c
index fecfdc260e9e7054bf0194a410a97bf2f7a6caf4..d1e45e00a418675a1c50087c7b63d6de24c98a30 100644 (file)
--- a/cheat.c
+++ b/cheat.c
@@ -1,19 +1,14 @@
-#define DEFINE_GLOBALS_FROM_INCLUDES
 #include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <time.h>
 #include "advent.h"
-#include "database.h"
 #include "linenoise/linenoise.h"
-#include "newdb.h"
+#include "dungeon.h"
 
 struct game_t game;
 
-long LNLENG, LNPOSN;
-char rawbuf[LINESIZE], INLINE[LINESIZE + 1];
-
 FILE  *logfp = NULL, *rfp = NULL;
 bool oldstyle = false;
 bool editline = true;
@@ -55,18 +50,17 @@ int main(int argc, char *argv[])
                     "        -v version number of save format.\n");
             fprintf(stderr,
                     "        -o file name of save game to write.\n");
-            exit(-1);
+            exit(EXIT_FAILURE);
             break;
         }
     }
-    
-    if (savefilename == NULL)
-    {
+
+    if (savefilename == NULL) {
         fprintf(stderr,
                 usage, argv[0]);
         fprintf(stderr,
                 "ERROR: filename required\n");
-        exit(-1);
+        exit(EXIT_FAILURE);
     }
 
     FILE *fp = NULL;
@@ -81,25 +75,24 @@ int main(int argc, char *argv[])
     /*  Initialize game variables */
     initialise();
 
-    game.zzword = rndvoc(3, 0);
+    make_zzword(game.zzword);
     game.newloc = LOC_START;
     game.loc = LOC_START;
     game.limit = GAMELIMIT;
-    
+
     // apply cheats
     game.numdie = numdie;
     game.saved = saved;
-    
+
     fp = fopen(savefilename, WRITE_MODE);
-    if (fp == NULL)
-    {
+    if (fp == NULL) {
         fprintf(stderr,
                 "Can't open file %s. Exiting.\n", savefilename);
-        exit(-1);
-    }        
+        exit(EXIT_FAILURE);
+    }
 
     savefile(fp, version);
-    
+
     printf("cheat: %s created.\n", savefilename);
     return 0;
 }