X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmain.c;h=f8118674616aed8195a50e6502749b4ed107e11b;hb=435c55c675cad9355a4e82c4d4379267f0c9a9b0;hp=2ca2c8cb64b0f477c28c9cf1c3093bdb9104cb34;hpb=9ea97fca7b7de4de9ed61680de4bb08cd19ff206;p=plomrogue

diff --git a/src/main.c b/src/main.c
index 2ca2c8c..f811867 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,6 +7,7 @@
 #include <time.h> /* for time() */
 #include <unistd.h> /* for unlink(), getopt(), optarg */
 #include <stdint.h> /* for uint8_t */
+#include <errno.h> /* for errno */
 #include "windows.h" /* for structs WinMeta, Win, init_win(), init_win_meta(),
                       * draw_all_wins()
                       */
@@ -31,9 +32,28 @@
 int main(int argc, char *argv[])
 {
     struct World world;
+    char * recordfile = "record";
+    char * savefile = "savefile";
+    char * err_x = "A file 'record' exists, but no 'savefile'. If everything "
+                   "was in order, both or none would exist. I won't start "
+                   "until this is corrected.";
+    if (!access(recordfile, F_OK) && access(savefile, F_OK))
+    {
+        errno = 0;
+        exit_err(1, &world, err_x);
+    }
+    err_x        = "A 'savefile' exists, but no file 'record'. If everything "
+                   "was in order, both or none would exist. I won't start "
+                   "until this is corrected.";
+
+    if (!access(savefile, F_OK) && access(recordfile, F_OK))
+    {
+        errno = 0;
+        exit_err(1, &world, err_x);
+    }
     char * recordfile_tmp = "record_tmp";
     char * savefile_tmp   = "savefile_tmp";
-    char * err_x = "A file 'recordfile_tmp' exists, probably from a corrupted "
+    err_x        = "A file 'recordfile_tmp' exists, probably from a corrupted "
                    "previous record saving process. To avoid game record "
                    "corruption, I won't start until it is removed or renamed.";
     exit_err(!access(recordfile_tmp, F_OK), &world, err_x);
@@ -79,7 +99,6 @@ int main(int argc, char *argv[])
                    "reading from opened 'savefile'.";
     char * err_c = "Trouble loading game (fclose() in main()) / "
                    "closing opened 'savefile'.";
-    char * savefile = "savefile";
     FILE * file;
     if (1 == world.interactive && 0 == access(savefile, F_OK))
     {
@@ -87,6 +106,7 @@ int main(int argc, char *argv[])
         exit_err(0 == file, &world, err_o);
         if (   read_uint32_bigendian(file, &world.seed)
             || read_uint32_bigendian(file, &world.turn)
+            || read_uint16_bigendian(file, &world.score)
             || read_uint16_bigendian(file, &player.pos.y)
             || read_uint16_bigendian(file, &player.pos.x)
             || read_uint8(file, &player.hitpoints)
@@ -107,7 +127,6 @@ int main(int argc, char *argv[])
                 "opening file 'record' for reading.";
         err_r = "Trouble loading record file (read_uint32_bigendian() in "
                 "main()) / reading from opened file 'record'.";
-        char * recordfile = "record";
         world.turn = 1;
         if (0 == world.interactive)
         {
@@ -122,11 +141,10 @@ int main(int argc, char *argv[])
         else
         {
             world.seed = time(NULL);
+            world.score = 0;
 
-            err_x        = "Trouble recording new seed: "
-                           "A file 'record' already exists, when it shouldn't.";
             err_o        = "Trouble recording new seed (fopen() in main()) / "
-                           "opening'record_tmp' file for writing.";
+                           "opening 'record_tmp' file for writing.";
             char * err_w = "Trouble recording new seed "
                            "(write_uint32_bigendian() in main()) / writing to "
                            "opened file 'record_tmp'.";
@@ -134,7 +152,6 @@ int main(int argc, char *argv[])
                            "closing opened file 'record_tmp'.";
             char * err_m = "Trouble recording new seed (rename() in main()) : "
                            "renaming file 'record_tmp' to 'record'.";
-            exit_err(!access(recordfile, F_OK), &world, err_x);
             file = fopen(recordfile_tmp, "w");
             exit_err(0 == file, &world, err_o);
             exit_err(write_uint32_bigendian(world.seed, file), &world, err_w);
@@ -177,7 +194,7 @@ int main(int argc, char *argv[])
     struct Win win_keys = init_win(&win_meta, "Keys",
                                    0, 29, &world, draw_keys_win);
     struct Win win_info = init_win(&win_meta, "Info",
-                                   2, 20, &world, draw_info_win);
+                                   3, 20, &world, draw_info_win);
     uint16_t height_logwin = win_meta.padframe.size.y
                              - (2 + win_info.frame.size.y);
     struct Win win_log = init_win(&win_meta, "Log",