X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=cheat.c;h=b75fccf9c47951f217e7d4696357b97817ff8d21;hp=f62dba95459efa51aae5d369f9ba7b3ab63def3b;hb=9e2cb3c19196a26af8e20803314f42b69dc0e014;hpb=70838f7001970c3906210077618a2583ed17b681

diff --git a/cheat.c b/cheat.c
index f62dba9..b75fccf 100644
--- a/cheat.c
+++ b/cheat.c
@@ -10,37 +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;
+    int 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* 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 value.\n"
-                        "        -s number of saves. Signed integer value.\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 = (turn_t)atoi(optarg);
+            printf("cheat: game.numdie = %ld\n", game.numdie);
+            break;
+        case 'l':
+            game.limit = (turn_t)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 = (turn_t)atoi(optarg);
+            printf("cheat: game.turns = %ld\n", game.turns);
             break;
         case 'v':
-            version = (long)atoi(optarg);;
+            version = atoi(optarg);
+            printf("cheat: version = %d\n", version);
             break;
         case 'o':
             savefilename = optarg;
@@ -62,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,
@@ -78,6 +86,8 @@ int main(int argc, char *argv[])
 
     savefile(fp, version);
 
+    fclose(fp);
+
     printf("cheat: %s created.\n", savefilename);
 
     return EXIT_SUCCESS;