X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.c;h=24e0058d684247890d9bfbd64395d5a18bc3c7c0;hb=b4d3dd91f438b97be97afa51e7a0c208f1ae475b;hp=7096f6c65a536f7c9d74323602e0526997099ced;hpb=81eaa1110b9721b7e7167dcb49bd1077d7b3f016;p=plomrogue
diff --git a/src/main.c b/src/main.c
index 7096f6c..24e0058 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,9 +14,7 @@
* 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()
@@ -62,19 +61,22 @@ int main(int argc, char *argv[])
world.monster = 0;
world.item = 0;
init_map_object_defs(&world, "defs");
+ uint8_t err = 0;
/* For interactive mode, try to load world state from savefile. */
FILE * file;
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);
+ err = err | read_uint32_bigendian(file, &world.seed);
+ err = err | read_uint32_bigendian(file, &world.turn);
+ err = err | read_uint16_bigendian(file, &player.pos.y);
+ err = err | read_uint16_bigendian(file, &player.pos.x);
+ player.pos.y--;
+ player.pos.x--;
+ err = err | read_uint8(file, &player.hitpoints);
+ err = err | read_map_objects(&world, &world.monster, file);
+ err = err | read_map_objects(&world, &world.item, file);
fclose(file);
}
@@ -85,20 +87,23 @@ int main(int argc, char *argv[])
if (0 == world.interactive)
{
file = fopen("record", "r");
- world.seed = read_uint32_bigendian(file);
+ err = err | read_uint32_bigendian(file, &world.seed);
+ }
+
+ /* For interactive-mode in newly started world, generate a start seed
+ * from the current time.
+ */
+ else
+ {
+ file = fopen("record", "w");
+ world.seed = time(NULL);
+ err = err | write_uint32_bigendian(world.seed, file);
+ fclose(file);
}
+ }
+
+ exit_err(err, &world, "Failure initializing game.");
- /* 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.
@@ -147,8 +152,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;