Corrected window title creation.

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index f637aea1558ddcd8884db86c3c2f5d929ac0a342..0ecc10a3dec4b3aa30233cc52df1ffe2e430e595 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
     world.score = 0;
     world.log = calloc(1, sizeof(char));
     set_cleanup_flag(CLEANUP_LOG);
-    update_log (&world, " ");
+    update_log(&world, " ");
     struct Player player;
     player.hitpoints = 5;
     world.player = &player;
@@ -204,18 +204,15 @@ int main(int argc, char *argv[])
                         "main().";
     exit_err(init_win_meta(screen, &win_meta), &world, err_winmem);
     world.wins.meta = &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", 3,  20, &world, draw_info_win);
-    struct Win win_log  = init_win(&win_meta,
-                                  "Log",  -4,  20, &world, draw_log_win);
-    struct Win win_map  = init_win(&win_meta,
-                                  "Map",   0, -51, &world, draw_map_win);
-    world.wins.keys = &win_keys;
-    world.wins.log = &win_log;
-    world.wins.info = &win_info;
-    world.wins.map = &win_map;
+    world.wins.keys = init_win_from_file(&world, "Keys", draw_keys_win);
+    set_cleanup_flag(CLEANUP_WIN_KEYS);
+    world.wins.info = init_win_from_file(&world, "Info", draw_info_win);
+    set_cleanup_flag(CLEANUP_WIN_INFO);
+    world.wins.log = init_win_from_file(&world, "Log", draw_log_win);
+    set_cleanup_flag(CLEANUP_WIN_LOG);
+    world.wins.map = init_win_from_file(&world, "Map", draw_map_win);
+    set_cleanup_flag(CLEANUP_WIN_MAP);
+
     sorted_wintoggle(&world);
 
     /* Replay mode. */