Magic-number and state-arithmetic removal.

[open-adventure.git] / cheat.c

diff --git a/cheat.c b/cheat.c
index f305dbaea53dee1b6321099524907f4e164e5ff7..89b0f72265b544b37cfe755cf9a9f9ac2acc23a4 100644 (file)
--- a/cheat.c
+++ b/cheat.c
@@ -1,18 +1,31 @@
-#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;
+struct game_t game = {
+    .dloc[1] = LOC_KINGHALL,
+    .dloc[2] = LOC_WESTBANK,
+    .dloc[3] = LOC_Y2,
+    .dloc[4] = LOC_ALIKE3,
+    .dloc[5] = LOC_COMPLEX,
 
-long LNLENG, LNPOSN;
-char rawbuf[LINESIZE], INLINE[LINESIZE + 1];
+    /*  Sixth dwarf is special (the pirate).  He always starts at his
+     *  chest's eventual location inside the maze. This loc is saved
+     *  in chloc for ref. The dead end in the other maze has its
+     *  loc stored in chloc2. */
+    .dloc[6] = LOC_DEADEND12,
+    .chloc   = LOC_DEADEND12,
+    .chloc2  = LOC_DEADEND13,
+    .abbnum  = 5,
+    .clock1  = WARNTIME,
+    .clock2  = FLASHTIME,
+    .blklin  = true
+};
 
 FILE  *logfp = NULL, *rfp = NULL;
 bool oldstyle = false;
@@ -55,29 +68,21 @@ 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;
 
-    game.lcg_a = 1093;
-    game.lcg_c = 221587;
-    game.lcg_m = 1048576;
-    srand(time(NULL));
-    long seedval = (long)rand();
-    set_seed(seedval);
-
     /*  Initialize game variables */
     initialise();
 
@@ -85,21 +90,20 @@ int main(int argc, char *argv[])
     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;
 }