X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.c;h=e2dc1b5309276cd7f2097036905137264d46d0b3;hb=9a9f9b13bef8394e1b25dc4d67ff72164dd28cce;hp=786e72e51f173349e90740e027515d1067430bf4;hpb=6907fb5902bd50d590b6886e6b30090db5b47444;p=plomrogue

diff --git a/src/main.c b/src/main.c
index 786e72e..e2dc1b5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -203,11 +203,9 @@ int main(int argc, char *argv[])
     raw();
     init_keybindings(&world);
     set_cleanup_flag(CLEANUP_KEYBINDINGS);
-    struct WinMeta win_meta;
-    char * err_winmem = "Trouble with init_win_meta() or draw_all_wins() in "
-                        "main().";
-    exit_err(init_win_meta(screen, &win_meta), &world, err_winmem);
-    world.wins.meta = &win_meta;
+    char * err_winmem = "Trouble with init_win_meta() in main ().";
+    exit_err(init_win_meta(screen, &world.wins.meta), &world, err_winmem);
+    set_cleanup_flag(CLEANUP_WIN_META);
     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);
@@ -216,8 +214,8 @@ int main(int argc, char *argv[])
     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);
+    err_winmem = "Trouble with draw_all_wins() in main().";
 
     /* Replay mode. */
     int key;
@@ -238,7 +236,7 @@ int main(int argc, char *argv[])
         }
         while (1)
         {
-            draw_all_wins(&win_meta);
+            draw_all_wins(world.wins.meta);
             key = getch();
             if (   EOF != action
                 && key == get_action_key(world.keybindings, "wait"))
@@ -264,7 +262,7 @@ int main(int argc, char *argv[])
         while (1)
         {
             save_game(&world);
-            draw_all_wins(&win_meta);
+            draw_all_wins(world.wins.meta);
             key = getch();
             if (0 != player.hitpoints && 0 == player_control(key, &world))
             {