X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.c;h=1f9d7f7b89c01ee591f8ce911433f9238f323be8;hb=b392e7b60ee954f1a8476d2cd2d92538b1873b2f;hp=d2fb9bf2140c1b84b9b1495391bacf322c3d8f76;hpb=b9082c113c43afe5c6a11c2b72f845ee2f8c6aea;p=plomrogue
diff --git a/src/main.c b/src/main.c
index d2fb9bf..1f9d7f7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,10 +2,12 @@
#include "main.h"
#include /* for atoi(), exit(), EXIT_FAILURE, calloc() */
-#include /* for FILE typedef, F_OK */
+#include /* for FILE typedef, F_OK, rename() */
#include /* for initscr(), noecho(), curs_set(), keypad(), raw() */
#include /* for time() */
-#include /* for getopt(), optarg */
+#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()
*/
@@ -30,6 +32,35 @@
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";
+ 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);
+ err_x = "A file 'savefile_tmp' exists, probably from a corrupted "
+ "previous game saving process. To avoid savegame "
+ "corruption, I won't start until it is removed or renamed.";
+ exit_err(!access(savefile_tmp, F_OK), &world, err_x);
/* Read in startup options (i.e. replay option and replay start turn). */
int opt;
@@ -60,33 +91,48 @@ int main(int argc, char *argv[])
world.monster = 0;
world.item = 0;
init_map_object_defs(&world, "defs");
- uint8_t fail = 0;
/* For interactive mode, try to load world state from 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))
+ if (1 == world.interactive && 0 == access(savefile, F_OK))
{
- file = fopen("savefile", "r");
- fail = fail | read_uint32_bigendian(file, &world.seed);
- fail = fail | read_uint32_bigendian(file, &world.turn);
- fail = fail | read_uint16_bigendian(file, &player.pos.y);
- fail = fail | read_uint16_bigendian(file, &player.pos.x);
+ file = fopen(savefile, "r");
+ 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)
+ || read_map_objects(&world, &world.monster, file)
+ || read_map_objects(&world, &world.item, file))
+ {
+ exit_err(1, &world, err_r);
+ }
+ exit_err(fclose(file), &world, err_c);
player.pos.y--;
player.pos.x--;
- fail = fail | read_uint8(file, &player.hitpoints);
- fail = fail | read_map_objects(&world, &world.monster, file);
- fail = fail | read_map_objects(&world, &world.item, file);
- fclose(file);
}
/* For non-interactive mode, try to load world state from record file. */
else
{
+ 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)
{
- file = fopen("record", "r");
- fail = fail | read_uint32_bigendian(file, &world.seed);
+ file = fopen(recordfile, "r");
+ exit_err(NULL == file, &world, err_o);
+ exit_err(read_uint32_bigendian(file, &world.seed), &world, err_r);
}
/* For interactive-mode in newly started world, generate a start seed
@@ -94,15 +140,26 @@ int main(int argc, char *argv[])
*/
else
{
- file = fopen("record", "w");
world.seed = time(NULL);
- fail = fail | write_uint32_bigendian(world.seed, file);
- fclose(file);
+ world.score = 0;
+
+ 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);
+ exit_err(fclose(file), &world, err_c);
+ exit_err(rename(recordfile_tmp, recordfile), &world, err_m);
}
}
- exit_err(fail, &world, "Failure initializing game.");
-
/* Generate map from seed and, if newly generated world, start positions of
* actors.
@@ -131,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",
@@ -151,8 +210,8 @@ int main(int argc, char *argv[])
/* Replay mode. */
int key;
- unsigned char quit_called = 0;
- unsigned char await_actions = 1;
+ uint8_t quit_called = 0;
+ uint8_t await_actions = 1;
if (0 == world.interactive)
{
int action;
@@ -164,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
@@ -205,6 +264,9 @@ int main(int argc, char *argv[])
&win_map, &win_info, &win_log);
if (1 == quit_called)
{
+ err_c = "Trouble closing 'record' file (fclose() in "
+ "main()).";
+ exit_err(fclose(file), &world, err_c);
exit_game(&world);
}
}