X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.c;h=bd25c4fcdd840244a72577ce78e9c912a11880bc;hb=f8325a4ea617b15315183d7a8027c0b913c91034;hp=6c60afa83de8f613aa1e0ccf83ed6e317fe1fedf;hpb=e6dcab0e1261bc96d7754b24b798cc3a5f262335;p=plomrogue
diff --git a/src/main.c b/src/main.c
index 6c60afa..bd25c4f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -200,30 +200,19 @@ int main(int argc, char *argv[])
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 "
+ 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;
- struct Win win_keys = init_win(&win_meta, "Keys",
- 0, 29, &world, draw_keys_win);
+ struct Win win_keys = init_win_from_file(&world, "Keys", draw_keys_win);
+ struct Win win_info = init_win_from_file(&world, "Info", draw_info_win);
+ struct Win win_log = init_win_from_file(&world, "Log", draw_log_win);
+ struct Win win_map = init_win_from_file(&world, "Map", draw_map_win);
world.wins.keys = &win_keys;
- struct Win win_info = init_win(&win_meta, "Info",
- 3, 20, &world, draw_info_win);
+ world.wins.log = &win_log;
world.wins.info = &win_info;
- 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);
- world.wins.log = &win_log;
- 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.map = &win_map;
- toggle_window(&win_meta, world.wins.keys);
- toggle_window(&win_meta, world.wins.map);
- toggle_window(&win_meta, world.wins.info);
- toggle_window(&win_meta, world.wins.log);
+ world.wins.map = &win_map;
+ sorted_wintoggle(&world);
/* Replay mode. */
int key;