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;
world.monster = 0;
world.item = 0;
init_map_object_defs(&world, "config/defs");
+ set_cleanup_flag(CLEANUP_MAP_OBJECT_DEFS);
+ exit_err(1, &world, NULL);
/* For interactive mode, try to load world state from savefile. */
char * err_o = "Trouble loading game (fopen() in main()) / "
"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);
- 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
- - win_log.frame.size.x - 2;
- struct Win win_map = init_win(&win_meta, "Map",
- 0, width_mapwin, &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. */