X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fmain.c;h=c92d604c7ba3404982c614137155a155133c9864;hb=fcf58a650b9c0a9c3aa08c2c25ea14d70e08f8c7;hp=d1ec7c0ba196314bfa6aee53f53f60b236578ff1;hpb=f92f23955f2aec3bf90dce810706f8a6062f6c72;p=plomrogue diff --git a/src/main.c b/src/main.c index d1ec7c0..c92d604 100644 --- a/src/main.c +++ b/src/main.c @@ -7,6 +7,7 @@ #include /* for time() */ #include /* for unlink(), getopt(), optarg */ #include /* for uint8_t */ +#include /* for errno */ #include "windows.h" /* for structs WinMeta, Win, init_win(), init_win_meta(), * draw_all_wins() */ @@ -27,13 +28,34 @@ #include "yx_uint16.h" /* for dir enum */ #include "rrand.h" /* for rrand(), rrand_seed() */ #include "rexit.h" /* for exit_game() */ +#include "control.h" /* for meta_keys() */ + int main(int argc, char *argv[]) { struct World world; + char * recordfile = "record"; + char * savefile = "savefile"; + char * err_x = "A file 'record' exists, but no 'savefile'. If everything " + "was in order, both or none would exist. I won't start " + "until this is corrected."; + if (!access(recordfile, F_OK) && access(savefile, F_OK)) + { + errno = 0; + exit_err(1, &world, err_x); + } + err_x = "A 'savefile' exists, but no file 'record'. If everything " + "was in order, both or none would exist. I won't start " + "until this is corrected."; + + if (!access(savefile, F_OK) && access(recordfile, F_OK)) + { + errno = 0; + exit_err(1, &world, err_x); + } char * recordfile_tmp = "record_tmp"; char * savefile_tmp = "savefile_tmp"; - char * err_x = "A file 'recordfile_tmp' exists, probably from a corrupted " + err_x = "A file 'recordfile_tmp' exists, probably from a corrupted " "previous record saving process. To avoid game record " "corruption, I won't start until it is removed or renamed."; exit_err(!access(recordfile_tmp, F_OK), &world, err_x); @@ -79,7 +101,6 @@ int main(int argc, char *argv[]) "reading from opened 'savefile'."; char * err_c = "Trouble loading game (fclose() in main()) / " "closing opened 'savefile'."; - char * savefile = "savefile"; FILE * file; if (1 == world.interactive && 0 == access(savefile, F_OK)) { @@ -87,6 +108,7 @@ int main(int argc, char *argv[]) exit_err(0 == file, &world, err_o); if ( read_uint32_bigendian(file, &world.seed) || read_uint32_bigendian(file, &world.turn) + || read_uint16_bigendian(file, &world.score) || read_uint16_bigendian(file, &player.pos.y) || read_uint16_bigendian(file, &player.pos.x) || read_uint8(file, &player.hitpoints) @@ -107,12 +129,11 @@ int main(int argc, char *argv[]) "opening file 'record' for reading."; err_r = "Trouble loading record file (read_uint32_bigendian() in " "main()) / reading from opened file 'record'."; - char * recordfile = "record"; world.turn = 1; 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); } @@ -122,9 +143,8 @@ int main(int argc, char *argv[]) else { world.seed = time(NULL); + world.score = 0; - err_x = "Trouble recording new seed: " - "A file 'record' already exists, when it shouldn't."; err_o = "Trouble recording new seed (fopen() in main()) / " "opening 'record_tmp' file for writing."; char * err_w = "Trouble recording new seed " @@ -134,7 +154,6 @@ int main(int argc, char *argv[]) "closing opened file 'record_tmp'."; char * err_m = "Trouble recording new seed (rename() in main()) : " "renaming file 'record_tmp' to 'record'."; - exit_err(!access(recordfile, F_OK), &world, err_x); file = fopen(recordfile_tmp, "w"); exit_err(0 == file, &world, err_o); exit_err(write_uint32_bigendian(world.seed, file), &world, err_w); @@ -172,24 +191,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", - 2, 20, &world, draw_info_win); + 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; @@ -243,8 +268,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 " @@ -305,8 +329,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);