Removed fragment of old shift_active_win(), moved one explanatory comment from it...

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3ca00e70cda19aef478759e409b58cfca4ad1f85..5cc1ecbf80c292fcb8d983d1a279c8f44b24a0c2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2,10 +2,10 @@
 
 #include "main.h"
 #include <stdlib.h> /* for atoi(), exit(), EXIT_FAILURE, calloc() */
-#include <stdio.h> /* for FILE typedef, F_OK */
+#include <stdio.h> /* for FILE typedef, F_OK, rename() */
 #include <ncurses.h> /* for initscr(), noecho(), curs_set(), keypad(), raw() */
 #include <time.h> /* for time() */
-#include <unistd.h> /* for getopt(), optarg */
+#include <unistd.h> /* for unlink(), getopt(), optarg */
 #include <stdint.h> /* for uint8_t */
 #include "windows.h" /* for structs WinMeta, Win, init_win(), init_win_meta(),
                       * draw_all_wins()
@@ -31,6 +31,16 @@
 int main(int argc, char *argv[])
 {
     struct World world;
+    char * recordfile_tmp = "record_tmp";
+    char * savefile_tmp   = "savefile_tmp";
+    char * 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);
+    err_x        = "A file 'savefile_tmp' exists, probably from a corrupted "
+                   "previous game saving process. To avoid savegame "
+                   "corruption, I won't start until it is removed or renamed.";
+    exit_err(!access(savefile_tmp,   F_OK), &world, err_x);
 
     /* Read in startup options (i.e. replay option and replay start turn). */
     int opt;
@@ -113,17 +123,16 @@ int main(int argc, char *argv[])
         {
             world.seed = time(NULL);
 
-            char * err_x = "Error recording new seed: "
+            err_x        = "Error recording new seed: "
                            "A file 'record' already exists, when it shouldn't.";
             err_o        = "Error recording new seed: "
                            "Unable to open 'record_tmp' file for writing.";
             char * err_w = "Error recording new seed: "
-                           "Trouble writing to opened 'record_tmp' file.";
+                           "Trouble writing to opened file 'record_tmp'.";
             err_c        = "Error recording new seed: "
                            "Unable to close opened file 'record_tmp'.";
             char * err_m = "Error recording new seed: "
                            "Unable to rename file 'record_tmp' to 'record'.";
-            char * recordfile_tmp = "record_tmp";
             exit_err(!access(recordfile, F_OK), &world, err_x);
             file = fopen(recordfile_tmp, "w");
             exit_err(0 == file, &world, err_o);
@@ -161,7 +170,8 @@ int main(int argc, char *argv[])
     raw();
     init_keybindings(&world);
     set_cleanup_flag(CLEANUP_KEYBINDINGS);
-    struct WinMeta win_meta = init_win_meta(screen);
+    struct WinMeta win_meta;
+    init_win_meta(screen, &win_meta);
     struct Win win_keys = init_win(&win_meta, "Keys",
                                    0, 29, &world, draw_keys_win);
     struct Win win_info = init_win(&win_meta, "Info",