X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.c;h=f637aea1558ddcd8884db86c3c2f5d929ac0a342;hb=3b2c82991c9ab169b33248c7be840a9bcd351e6d;hp=06f53ab39d14945c11d04a4bf89ce9aad8da683d;hpb=385ac8287af0e5e5b5ab0539b47cda9b8dcbec58;p=plomrogue
diff --git a/src/main.c b/src/main.c
index 06f53ab..f637aea 100644
--- a/src/main.c
+++ b/src/main.c
@@ -200,25 +200,21 @@ 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(&win_meta,
+ "Keys", 0, 29, &world, draw_keys_win);
+ struct Win win_info = init_win(&win_meta,
+ "Info", 3, 20, &world, draw_info_win);
+ struct Win win_log = init_win(&win_meta,
+ "Log", -4, 20, &world, draw_log_win);
+ struct Win win_map = init_win(&win_meta,
+ "Map", 0, -51, &world, 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.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.info = &win_info;
world.wins.map = &win_map;
sorted_wintoggle(&world);