Reference map only through world struct.

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index c48d57b4c8a2cca865fecbb06840240d3073d190..7096f6c65a536f7c9d74323602e0526997099ced 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -22,11 +22,12 @@
                           */
 #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 +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;
@@ -104,9 +106,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 +120,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 +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);
                 }
             }
         }
@@ -252,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);
                 }
             }
         }