sorted_winttogle_and_activate() now sufficiently tolerates toggle_order_and_activate...

[plomrogue] / src / main.c

diff --git a/src/main.c b/src/main.c
index 478f764d4586d43908632a0512a1b03bd58b495d..457143847899e17e4257b68843a108fd3cdd5f3b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -152,16 +152,14 @@ int main(int argc, char *argv[])
     world.seed = restore_seed;
 
     /* Initialize window system and windows. */
-    WINDOW * screen = initscr();
+    init_win_meta();
     set_cleanup_flag(CLEANUP_NCURSES);
     noecho();
     curs_set(0);
-    keypad(screen, TRUE);
+    keypad(world.wmeta->screen, TRUE);
     raw();
-    init_win_meta(screen);
-    set_cleanup_flag(CLEANUP_WIN_META);
     load_interface_conf();
-    set_cleanup_flag(CLEANUP_INTERFACE_CONF);
+    set_cleanup_flag(CLEANUP_INTERFACE);
 
     /* Focus map on player. */
     struct MapObj * player = get_player();