X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.c;h=9bb983dcb5ff212d5e1aae9478cc2265b1c30b85;hb=76bcc7383e9b111e02e83c2d822633cf1be88aab;hp=478f764d4586d43908632a0512a1b03bd58b495d;hpb=c72ed6261224cc0a1b8aa72f6af966715970ff60;p=plomrogue
diff --git a/src/main.c b/src/main.c
index 478f764..9bb983d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
init_command_db();
set_cleanup_flag(CLEANUP_COMMAND_DB);
init_map_object_actions();
- set_cleanup_flag(CLEANUP_MAPOBJACTS);
+ set_cleanup_flag(CLEANUP_MAP_OBJECT_ACTS);
/* Check for corrupted savefile / recordfile savings. */
char * recordfile = "record";
@@ -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();