X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmain.c;h=d2fb9bf2140c1b84b9b1495391bacf322c3d8f76;hb=b9082c113c43afe5c6a11c2b72f845ee2f8c6aea;hp=c48d57b4c8a2cca865fecbb06840240d3073d190;hpb=1afe61cf5429407b416177893c7c86424ba31ff4;p=plomrogue

diff --git a/src/main.c b/src/main.c
index c48d57b..d2fb9bf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,20 +13,19 @@
                         * draw_log_win()
                         */
 #include "keybindings.h" /* for initkeybindings(), get_action_key() */
-#include "readwrite.h" /* for read_uint16_bigendian, read_uint32_bigendian,
-                        * write_uint32_bigendian
-                        */
+#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */
 #include "map_objects.h" /* for structs Monster, Item, Player,
                           * init_map_object_defs(), read_map_objects(),
                           * build_map_objects()
                           */
 #include "map_object_actions.h" /* for player_wait(), move_player() */
 #include "map.h" /* for struct Map, init_map() */
-#include "misc.h" /* for update_log(), toggle_window(), exit_game(),
-                   * find_passable_pos(), meta_keys(), save_game()
+#include "misc.h" /* for update_log(), toggle_window(), find_passable_pos(),
+                   * meta_keys(), save_game()
                    */
 #include "yx_uint16.h" /* for dir enum */
 #include "rrand.h" /* for rrand(), rrand_seed() */
+#include "rexit.h" /* for exit_game() */
 
 int main(int argc, char *argv[])
 {
@@ -53,6 +52,7 @@ int main(int argc, char *argv[])
 
     /* Initialize log, player, monster/item definitions and monsters/items. */
     world.log = calloc(1, sizeof(char));
+    set_cleanup_flag(CLEANUP_LOG);
     update_log (&world, " ");
     struct Player player;
     player.hitpoints = 5;
@@ -60,19 +60,22 @@ int main(int argc, char *argv[])
     world.monster = 0;
     world.item = 0;
     init_map_object_defs(&world, "defs");
+    uint8_t fail = 0;
 
     /* For interactive mode, try to load world state from savefile. */
     FILE * file;
     if (1 == world.interactive && 0 == access("savefile", F_OK))
     {
         file = fopen("savefile", "r");
-        world.seed = read_uint32_bigendian(file);
-        world.turn = read_uint32_bigendian(file);
-        player.pos.y = read_uint16_bigendian(file) - 1;
-        player.pos.x = read_uint16_bigendian(file) - 1;
-        player.hitpoints = fgetc(file);
-        read_map_objects(&world, &world.monster, file);
-        read_map_objects(&world, &world.item,    file);
+        fail = fail | read_uint32_bigendian(file, &world.seed);
+        fail = fail | read_uint32_bigendian(file, &world.turn);
+        fail = fail | read_uint16_bigendian(file, &player.pos.y);
+        fail = fail | read_uint16_bigendian(file, &player.pos.x);
+        player.pos.y--;
+        player.pos.x--;
+        fail = fail | read_uint8(file, &player.hitpoints);
+        fail = fail | read_map_objects(&world, &world.monster, file);
+        fail = fail | read_map_objects(&world, &world.item,    file);
         fclose(file);
     }
 
@@ -83,20 +86,23 @@ int main(int argc, char *argv[])
         if (0 == world.interactive)
         {
             file = fopen("record", "r");
-            world.seed = read_uint32_bigendian(file);
+            fail = fail | read_uint32_bigendian(file, &world.seed);
+        }
+
+        /* For interactive-mode in newly started world, generate a start seed
+         * from the current time.
+         */
+        else
+        {
+            file = fopen("record", "w");
+            world.seed = time(NULL);
+            fail = fail | write_uint32_bigendian(world.seed, file);
+            fclose(file);
         }
+    }
+
+    exit_err(fail, &world, "Failure initializing game.");
 
-      /* For interactive-mode in newly started world, generate a start seed
-       * from the current time.
-       */
-      else
-      {
-          file = fopen("record", "w");
-          world.seed = time(NULL);
-          write_uint32_bigendian(world.seed, file);
-          fclose(file);
-      }
-  }
 
     /* Generate map from seed and, if newly generated world, start positions of
      * actors.
@@ -104,9 +110,10 @@ int main(int argc, char *argv[])
     rrand_seed(world.seed);
     struct Map map = init_map();
     world.map = ↦
+    set_cleanup_flag(CLEANUP_MAP);
     if (1 == world.turn)
     {
-        player.pos = find_passable_pos(&map);
+        player.pos = find_passable_pos(world.map);
         void * foo;
         foo = build_map_objects(&world, &world.monster, 1, 1 + rrand() % 27);
         foo = build_map_objects(&world, foo, 2, 1 + rrand() % 9);
@@ -117,15 +124,20 @@ int main(int argc, char *argv[])
 
     /* Initialize window system and windows. */
     WINDOW * screen = initscr();
+    set_cleanup_flag(CLEANUP_NCURSES);
     noecho();
     curs_set(0);
     keypad(screen, TRUE);
     raw();
     init_keybindings(&world);
+    set_cleanup_flag(CLEANUP_KEYBINDINGS);
     struct WinMeta win_meta = init_win_meta(screen);
-    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);
-    uint16_t height_logwin  = win_meta.padframe.size.y - (2 + win_info.frame.size.y);
+    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);
+    uint16_t height_logwin = win_meta.padframe.size.y
+                             - (2 + win_info.frame.size.y);
     struct Win win_log = init_win(&win_meta, "Log",
                                   height_logwin, 20, &world, draw_log_win);
     uint16_t width_mapwin = win_meta.padframe.size.x - win_keys.frame.size.x
@@ -193,7 +205,7 @@ int main(int argc, char *argv[])
                                              &win_map, &win_info, &win_log);
                 if (1 == quit_called)
                 {
-                    exit_game(&world, &map);
+                    exit_game(&world);
                 }
             }
         }
@@ -252,7 +264,7 @@ int main(int argc, char *argv[])
                                              &win_map, &win_info, &win_log);
                 if (1 == quit_called)
                 {
-                    exit_game(&world, &map);
+                    exit_game(&world);
                 }
             }
         }