Added further (though rarely informative) handling of windows library error.

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index a9fb7b13807fb822f47a9b88bca6480f3f7f962e..229b9d36704a9f76cfc035ebe963e8c72c4d14fb 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()
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
             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: "
@@ -170,7 +170,9 @@ 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;
+    char * err_winmem = "Error: Window drawing memory allocation failed.";
+    exit_err(init_win_meta(screen, &win_meta), &world, err_winmem);
     struct Win win_keys = init_win(&win_meta, "Keys",
                                    0, 29, &world, draw_keys_win);
     struct Win win_info = init_win(&win_meta, "Info",
@@ -203,8 +205,8 @@ int main(int argc, char *argv[])
             }
             if (0 == start_turn)
             {
-                draw_all_wins (&win_meta);
-               key = getch();
+                exit_err(draw_all_wins(&win_meta), &world, err_winmem);
+                key = getch();
             }
             if (1 == await_actions
                 && (world.turn < start_turn