X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=cheat.c;h=b07b1021c1f875d423a784abaac02dbb13c93fcd;hp=bdfaa8a59b06c547612628e37ac119615156212c;hb=173b1b1acd8bf250594147d824c46547e3395549;hpb=f815299a2a97656b0f4ea0793c2207c2437888f6

diff --git a/cheat.c b/cheat.c
index bdfaa8a..b07b102 100644
--- a/cheat.c
+++ b/cheat.c
@@ -10,32 +10,52 @@
 #include <stdbool.h>
 #include "advent.h"
 
-FILE *logfp = NULL;
-bool oldstyle = false;
-bool prompt = true;
-
 int main(int argc, char *argv[])
 {
     int ch;
     char *savefilename = NULL;
-    long numdie = 0;
-    long saved = 1;
     long version = 0;
     FILE *fp = NULL;
 
+    // Initialize game variables
+    initialise();
+
+    /* we're generating a saved game, so saved once by default,
+     * unless overridden with command-line options below.
+     */
+    game.saved = 1;
+
     /*  Options. */
-    const char* opts = "d:s:v:o:";
-    const char* usage = "Usage: %s [-d numdie] [-s numsaves] [-v version] -o savefilename \n";
+    const char* opts = "d:l:s:t:v:o:";
+    const char* usage = "Usage: %s [-d numdie] [-s numsaves] [-v version] -o savefilename \n"
+                        "        -d number of deaths. Signed integer.\n"
+                        "        -l lifetime of lamp in turns. Signed integer.\n"
+                        "        -s number of saves. Signed integer.\n"
+                        "        -t number of turns. Signed integer.\n"
+                        "        -v version number of save format.\n"
+                        "        -o required. File name of save game to write.\n";
+
     while ((ch = getopt(argc, argv, opts)) != EOF) {
         switch (ch) {
         case 'd':
-            numdie = (long)atoi(optarg);
+            game.numdie = (long)atoi(optarg);
+            printf("cheat: game.numdie = %ld\n", game.numdie);
+            break;
+        case 'l':
+            game.limit = (long)atoi(optarg);
+            printf("cheat: game.limit = %ld\n", game.limit);
             break;
         case 's':
-            saved = (long)atoi(optarg);
+            game.saved = (long)atoi(optarg);
+            printf("cheat: game.saved = %ld\n", game.saved);
+            break;
+        case 't':
+            game.turns = (long)atoi(optarg);
+            printf("cheat: game.turns = %ld\n", game.turns);
             break;
         case 'v':
-            version = (long)atoi(optarg);;
+            version = (long)atoi(optarg);
+            printf("cheat: version = %ld\n", version);
             break;
         case 'o':
             savefilename = optarg;
@@ -43,14 +63,6 @@ int main(int argc, char *argv[])
         default:
             fprintf(stderr,
                     usage, argv[0]);
-            fprintf(stderr,
-                    "        -d number of deaths. Signed integer value.'\n");
-            fprintf(stderr,
-                    "        -s number of saves. Signed integer value.\n");
-            fprintf(stderr,
-                    "        -v version number of save format.\n");
-            fprintf(stderr,
-                    "        -o file name of save game to write.\n");
             exit(EXIT_FAILURE);
             break;
         }
@@ -65,13 +77,6 @@ int main(int argc, char *argv[])
         exit(EXIT_FAILURE);
     }
 
-    // Initialize game variables
-    initialise();
-
-    // apply cheats
-    game.numdie = numdie;
-    game.saved = saved;
-
     fp = fopen(savefilename, WRITE_MODE);
     if (fp == NULL) {
         fprintf(stderr,
@@ -81,6 +86,8 @@ int main(int argc, char *argv[])
 
     savefile(fp, version);
 
+    fclose(fp);
+
     printf("cheat: %s created.\n", savefilename);
 
     return EXIT_SUCCESS;