X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.c;h=7096f6c65a536f7c9d74323602e0526997099ced;hb=a974cdd6664ac23668baf50cdafe80b8c8838b1c;hp=2b16733115bfbab792c664d5dbdad3619b9e9b3c;hpb=349ca3893498469b4e002829d9a35da514d8b55d;p=plomrogue

diff --git a/src/main.c b/src/main.c
index 2b16733..7096f6c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,15 +18,16 @@
                         */
 #include "map_objects.h" /* for structs Monster, Item, Player,
                           * init_map_object_defs(), read_map_objects(),
-                          * read_map_objects_monsterdata,
-                          * read_map_objects_itemdata, build_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 rrand(), 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 +54,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;
@@ -71,9 +73,8 @@ int main(int argc, char *argv[])
         player.pos.y = read_uint16_bigendian(file) - 1;
         player.pos.x = read_uint16_bigendian(file) - 1;
         player.hitpoints = fgetc(file);
-        read_map_objects(&world.monster, file, sizeof(struct Monster),
-                          read_map_objects_monsterdata);
-        read_map_objects(&world.item,    file, sizeof(struct Item), NULL);
+        read_map_objects(&world, &world.monster, file);
+        read_map_objects(&world, &world.item,    file);
         fclose(file);
     }
 
@@ -102,47 +103,43 @@ int main(int argc, char *argv[])
     /* Generate map from seed and, if newly generated world, start positions of
      * actors.
      */
-    rrand(1, world.seed);
+    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);
-        void * foo = build_map_objects(&world, &world.monster,
-                                       0, 1 + rrand(0,0) % 27,
-                                       sizeof(struct Monster),
-                                       build_map_objects_monsterdata);
-        foo = build_map_objects(&world, foo, 1, 1 + rrand(0,0) % 9,
-                                sizeof(struct Monster),
-                                build_map_objects_monsterdata);
-        build_map_objects(&world, foo, 2, 1 + rrand(0,0) % 3,
-                          sizeof(struct Monster),
-                          build_map_objects_monsterdata);
-        foo = build_map_objects(&world, &world.item, 3, 1 + rrand(0,0) % 3,
-                                sizeof(struct Item),
-                                build_map_objects_itemdata);
-        build_map_objects(&world, foo, 4, 1 + rrand(0,0) % 3,
-                          sizeof(struct Item), build_map_objects_itemdata);
+        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);
+        build_map_objects(&world, foo, 3, 1 + rrand() % 3);
+        foo = build_map_objects(&world, &world.item, 4, 1 + rrand() % 3);
+        build_map_objects(&world, foo, 5, 1 + rrand() % 3);
     }
 
     /* 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", &world, draw_keys_win);
-    struct Win win_map = init_win(&win_meta, "Map", &world, draw_map_win);
-    struct Win win_info = init_win(&win_meta, "Info", &world, draw_info_win);
-    struct Win win_log = init_win(&win_meta, "Log", &world, draw_log_win);
-    win_keys.frame.size.x = 29;
-    win_map.frame.size.x = win_meta.padframe.size.x - win_keys.frame.size.x
-                           - win_log.frame.size.x - 2;
-    win_info.frame.size.y = 2;
-    win_log.frame.size.y = 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
+                             - win_log.frame.size.x - 2;
+    struct Win win_map = init_win(&win_meta, "Map",
+                                  0, width_mapwin, &world, draw_map_win);
     toggle_window(&win_meta, &win_keys);
     toggle_window(&win_meta, &win_map);
     toggle_window(&win_meta, &win_info);
@@ -204,7 +201,7 @@ int main(int argc, char *argv[])
                                              &win_map, &win_info, &win_log);
                 if (1 == quit_called)
                 {
-                    exit_game(&world, &map);
+                    exit_game(&world);
                 }
             }
         }
@@ -263,7 +260,7 @@ int main(int argc, char *argv[])
                                              &win_map, &win_info, &win_log);
                 if (1 == quit_called)
                 {
-                    exit_game(&world, &map);
+                    exit_game(&world);
                 }
             }
         }