In save_game(), error-exit on earliest of writing errors, not after cascade of them.

[plomrogue] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index cf69c8a8ecc91b7813c50d0585c10124b91e8c81..1edd7d2ed56068ac594671a4440ede252e6e2bad 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -133,21 +133,22 @@ extern void turn_over(struct World * world, char action)
 
 extern void save_game(struct World * world)
 {
-    char * err_msg = "Error saving game.";
-
     FILE * file = fopen("savefile", "w");
-    exit_err(0 == file, world, err_msg);
-
-    uint8_t err;
-    err = write_uint32_bigendian(world->seed, file);
-    err = err | write_uint32_bigendian(world->turn, file);
-    err = err | write_uint16_bigendian(world->player->pos.y + 1, file);
-    err = err | write_uint16_bigendian(world->player->pos.x + 1, file);
-    err = err | write_uint8(world->player->hitpoints, file);
-    err = err | write_map_objects(world, world->monster, file);
-    err = err | write_map_objects(world, world->item, file);
-    exit_err(err, world, err_msg);
-    exit_err(fclose(file), world, err_msg);
+    exit_err(0 == file, world,
+             "Error saving game: Unable to open savefile for writing.");
+    if (   write_uint32_bigendian(world->seed, file)
+        || write_uint32_bigendian(world->turn, file)
+        || write_uint16_bigendian(world->player->pos.y + 1, file)
+        || write_uint16_bigendian(world->player->pos.x + 1, file)
+        || write_uint8(world->player->hitpoints, file)
+        || write_map_objects(world, world->monster, file)
+        || write_map_objects(world, world->item, file))
+    {
+        exit_err(1, world,
+                 "Error saving game: Trouble writing to opened savefile.");
+    }
+    exit_err(fclose(file), world,
+             "Error saving game: Unable to close opened savefile.");
 }