X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmain.c;h=f8118674616aed8195a50e6502749b4ed107e11b;hb=435c55c675cad9355a4e82c4d4379267f0c9a9b0;hp=eddf4bfa7921dadabc13efdf0800a73ff236a23a;hpb=ad47c34bbc34f5511ba123d346899c2d47f90e0b;p=plomrogue diff --git a/src/main.c b/src/main.c index eddf4bf..f811867 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() */ @@ -31,9 +32,28 @@ 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); @@ -73,13 +93,12 @@ int main(int argc, char *argv[]) init_map_object_defs(&world, "defs"); /* For interactive mode, try to load world state from savefile. */ - char * err_o = "Error loading game: " - "Unable to open 'savefile' for reading."; - char * err_r = "Error loading game: " - "Trouble reading from opened 'savefile'."; - char * err_c = "Error loading game: " - "Unable to close opened 'savefile'."; - char * savefile = "savefile"; + char * err_o = "Trouble loading game (fopen() in main()) / " + "opening 'savefile' for reading."; + char * err_r = "Trouble loading game (in main()) / " + "reading from opened 'savefile'."; + char * err_c = "Trouble loading game (fclose() in main()) / " + "closing opened 'savefile'."; FILE * file; if (1 == world.interactive && 0 == access(savefile, F_OK)) { @@ -87,6 +106,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) @@ -103,11 +123,10 @@ int main(int argc, char *argv[]) /* For non-interactive mode, try to load world state from record file. */ else { - err_o = "Error loading record file: " - "Unable to open file 'record' for reading."; - err_r = "Error loading record file: " - "Trouble reading from opened file 'record'."; - char * recordfile = "record"; + err_o = "Trouble loading record file (fopen() in main()) / " + "opening file 'record' for reading."; + err_r = "Trouble loading record file (read_uint32_bigendian() in " + "main()) / reading from opened file 'record'."; world.turn = 1; if (0 == world.interactive) { @@ -122,18 +141,17 @@ int main(int argc, char *argv[]) else { world.seed = time(NULL); + world.score = 0; - err_x = "Error recording new seed: " - "A file 'record' already exists, when it shouldn't."; - err_o = "Error recording new seed: " - "Unable to open 'record_tmp' file for writing."; - char * err_w = "Error recording new seed: " - "Trouble writing to opened file 'record_tmp'."; - err_c = "Error recording new seed: " - "Unable to close opened file 'record_tmp'."; - char * err_m = "Error recording new seed: " - "Unable to rename file 'record_tmp' to 'record'."; - exit_err(!access(recordfile, F_OK), &world, err_x); + err_o = "Trouble recording new seed (fopen() in main()) / " + "opening 'record_tmp' file for writing."; + char * err_w = "Trouble recording new seed " + "(write_uint32_bigendian() in main()) / writing to " + "opened file 'record_tmp'."; + err_c = "Trouble recording new seed (fclose() in main()) / " + "closing opened file 'record_tmp'."; + char * err_m = "Trouble recording new seed (rename() in main()) : " + "renaming file 'record_tmp' to 'record'."; file = fopen(recordfile_tmp, "w"); exit_err(0 == file, &world, err_o); exit_err(write_uint32_bigendian(world.seed, file), &world, err_w); @@ -170,11 +188,13 @@ int main(int argc, char *argv[]) raw(); init_keybindings(&world); set_cleanup_flag(CLEANUP_KEYBINDINGS); - struct WinMeta win_meta = init_win_meta(screen); + struct WinMeta win_meta; + char * err_winmem = "Trouble with init_win() or draw_all_wins() in main()."; + exit_err(init_win_meta(screen, &win_meta), &world, err_winmem); struct Win win_keys = init_win(&win_meta, "Keys", 0, 29, &world, draw_keys_win); struct Win win_info = init_win(&win_meta, "Info", - 2, 20, &world, draw_info_win); + 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", @@ -203,8 +223,8 @@ int main(int argc, char *argv[]) } if (0 == start_turn) { - draw_all_wins (&win_meta); - key = getch(); + exit_err(draw_all_wins(&win_meta), &world, err_winmem); + key = getch(); } if (1 == await_actions && (world.turn < start_turn @@ -244,7 +264,8 @@ int main(int argc, char *argv[]) &win_map, &win_info, &win_log); if (1 == quit_called) { - err_c = "Error closing read 'record' file."; + err_c = "Trouble closing 'record' file (fclose() in " + "main())."; exit_err(fclose(file), &world, err_c); exit_game(&world); }