X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmain.c;h=a9fb7b13807fb822f47a9b88bca6480f3f7f962e;hb=59ae6cee193bc675cb6f7e80fde3055348c5dc82;hp=8c1ac5667dde5a1b33da92a8425888c4bbf36c72;hpb=c7cdbe6260e5cd6a8efe2c73a02c9635b67ec4b7;p=plomrogue
diff --git a/src/main.c b/src/main.c
index 8c1ac56..a9fb7b1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,6 +6,7 @@
#include /* for initscr(), noecho(), curs_set(), keypad(), raw() */
#include /* for time() */
#include /* for getopt(), optarg */
+#include /* for uint8_t */
#include "windows.h" /* for structs WinMeta, Win, init_win(), init_win_meta(),
* draw_all_wins()
*/
@@ -13,24 +14,33 @@
* draw_log_win()
*/
#include "keybindings.h" /* for initkeybindings(), get_action_key() */
-#include "readwrite.h" /* for read_uint16_bigendian, read_uint32_bigendian,
- * write_uint32_bigendian
- */
+#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */
#include "map_objects.h" /* for structs Monster, Item, Player,
* init_map_object_defs(), read_map_objects(),
* build_map_objects()
*/
#include "map_object_actions.h" /* for player_wait(), move_player() */
#include "map.h" /* for struct Map, init_map() */
-#include "misc.h" /* for update_log(), toggle_window(), exit_game(),
- * find_passable_pos(), meta_keys(), save_game()
+#include "misc.h" /* for update_log(), toggle_window(), find_passable_pos(),
+ * meta_keys(), save_game()
*/
#include "yx_uint16.h" /* for dir enum */
#include "rrand.h" /* for rrand(), rrand_seed() */
+#include "rexit.h" /* for exit_game() */
int main(int argc, char *argv[])
{
struct World world;
+ char * recordfile_tmp = "record_tmp";
+ char * savefile_tmp = "savefile_tmp";
+ char * 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;
@@ -53,6 +63,7 @@ int main(int argc, char *argv[])
/* Initialize log, player, monster/item definitions and monsters/items. */
world.log = calloc(1, sizeof(char));
+ set_cleanup_flag(CLEANUP_LOG);
update_log (&world, " ");
struct Player player;
player.hitpoints = 5;
@@ -62,41 +73,75 @@ 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";
FILE * file;
- if (1 == world.interactive && 0 == access("savefile", F_OK))
+ if (1 == world.interactive && 0 == access(savefile, F_OK))
{
- file = fopen("savefile", "r");
- world.seed = read_uint32_bigendian(file);
- world.turn = read_uint32_bigendian(file);
- player.pos.y = read_uint16_bigendian(file) - 1;
- player.pos.x = read_uint16_bigendian(file) - 1;
- player.hitpoints = fgetc(file);
- read_map_objects(&world, &world.monster, file);
- read_map_objects(&world, &world.item, file);
- fclose(file);
+ 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, &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--;
}
/* 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";
world.turn = 1;
if (0 == world.interactive)
{
- file = fopen("record", "r");
- world.seed = read_uint32_bigendian(file);
+ file = fopen(recordfile, "r");
+ exit_err(0 == 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
+ * from the current time.
+ */
+ else
+ {
+ world.seed = time(NULL);
+
+ 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 'record_tmp' file.";
+ 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);
+ 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);
}
+ }
- /* For interactive-mode in newly started world, generate a start seed
- * from the current time.
- */
- else
- {
- file = fopen("record", "w");
- world.seed = time(NULL);
- write_uint32_bigendian(world.seed, file);
- fclose(file);
- }
- }
/* Generate map from seed and, if newly generated world, start positions of
* actors.
@@ -104,9 +149,10 @@ int main(int argc, char *argv[])
rrand_seed(world.seed);
struct Map map = init_map();
world.map = ↦
+ set_cleanup_flag(CLEANUP_MAP);
if (1 == world.turn)
{
- player.pos = find_passable_pos(&map);
+ player.pos = find_passable_pos(world.map);
void * foo;
foo = build_map_objects(&world, &world.monster, 1, 1 + rrand() % 27);
foo = build_map_objects(&world, foo, 2, 1 + rrand() % 9);
@@ -117,11 +163,13 @@ int main(int argc, char *argv[])
/* Initialize window system and windows. */
WINDOW * screen = initscr();
+ set_cleanup_flag(CLEANUP_NCURSES);
noecho();
curs_set(0);
keypad(screen, TRUE);
raw();
init_keybindings(&world);
+ set_cleanup_flag(CLEANUP_KEYBINDINGS);
struct WinMeta win_meta = init_win_meta(screen);
struct Win win_keys = init_win(&win_meta, "Keys",
0, 29, &world, draw_keys_win);
@@ -142,8 +190,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;
@@ -196,7 +244,9 @@ int main(int argc, char *argv[])
&win_map, &win_info, &win_log);
if (1 == quit_called)
{
- exit_game(&world, &map);
+ err_c = "Error closing read 'record' file.";
+ exit_err(fclose(file), &world, err_c);
+ exit_game(&world);
}
}
}
@@ -255,7 +305,7 @@ int main(int argc, char *argv[])
&win_map, &win_info, &win_log);
if (1 == quit_called)
{
- exit_game(&world, &map);
+ exit_game(&world);
}
}
}