X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmain.c;h=8f13e080bfcde60ac246b7fcb5e5957f530badcb;hb=caf7e50574dc4fb3756a386257863e5b8b42ad98;hp=f8118674616aed8195a50e6502749b4ed107e11b;hpb=435c55c675cad9355a4e82c4d4379267f0c9a9b0;p=plomrogue
diff --git a/src/main.c b/src/main.c
index f811867..8f13e08 100644
--- a/src/main.c
+++ b/src/main.c
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
if (0 == world.interactive)
{
file = fopen(recordfile, "r");
- exit_err(0 == file, &world, err_o);
+ exit_err(NULL == file, &world, err_o);
exit_err(read_uint32_bigendian(file, &world.seed), &world, err_r);
}
@@ -189,24 +189,30 @@ 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() or draw_all_wins() in main().";
+ 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);
+ 0, 29, &world, draw_keys_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;
+ - win_log.frame.size.x - 2;
struct Win win_map = init_win(&win_meta, "Map",
0, width_mapwin, &world, draw_map_win);
- toggle_window(&win_meta, &win_keys);
- toggle_window(&win_meta, &win_map);
- toggle_window(&win_meta, &win_info);
- toggle_window(&win_meta, &win_log);
+ 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);
/* Replay mode. */
int key;
@@ -260,8 +266,7 @@ int main(int argc, char *argv[])
}
else
{
- quit_called = meta_keys(key, &world, &win_meta, &win_keys,
- &win_map, &win_info, &win_log);
+ quit_called = meta_keys(key, &world);
if (1 == quit_called)
{
err_c = "Trouble closing 'record' file (fclose() in "
@@ -322,8 +327,7 @@ int main(int argc, char *argv[])
}
else
{
- quit_called = meta_keys(key, &world, &win_meta, &win_keys,
- &win_map, &win_info, &win_log);
+ quit_called = meta_keys(key, &world);
if (1 == quit_called)
{
exit_game(&world);