Small refactoring for greater readability.

[plomrogue] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index dac4c974f07767228510e4444583a02be3f43d38..ab9963f9af491bc892cb3dce6fdb92582b2b9bb4 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,6 +1,8 @@
 /* misc.c */
 
 #include "misc.h"
+#include <stdio.h> /* for rename() */
+#include <unistd.h> /* for unlink(), acess() */
 #include <stdlib.h> /* for calloc(), free() */
 #include <string.h> /* for strlen(), strcmp(), memcpy() */
 #include <stdint.h> /* for uint8_t */
@@ -133,21 +135,36 @@ 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);
-    fclose(file);
+    char * err_open  = "Error saving game: "
+                       "Unable to open 'savefile_new' for writing.";
+    char * err_write = "Error saving game: "
+                       "Trouble writing to opened 'savefile_new'.";
+    char * err_close = "Error saving game: "
+                       "Unable to close opened 'savefile_new'.";
+    char * err_unl   = "Error saving game: "
+                       "Unable to unlink old 'savefile'.";
+    char * err_move  = "Error saving game: "
+                        "Unable to rename 'savefile_tmp' to 'savefile'.";
+    char * savefile_tmp = "savefile_tmp";
+    char * savefile     = "savefile";
+    FILE * file = fopen(savefile_tmp, "w");
+    exit_err(0 == file, world, err_open);
+    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, err_write);
+    }
+    exit_err(fclose(file), world, err_close);
+    if (!access(savefile, F_OK))
+    {
+        exit_err(unlink(savefile), world, err_unl);
+    }
+    exit_err(rename(savefile_tmp, savefile), world, err_move);
 }