X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmisc.c;h=711e049db2c067527924aaad8fab26b67ab394f8;hb=26fb22669c47b1191264d840ad240f2b901327d5;hp=cfa43caf14b7054e682d631a20b85e328a1bfbd9;hpb=6ba18516a602b3d4ad95981887ad9c5eb40a335a;p=plomrogue
diff --git a/src/misc.c b/src/misc.c
index cfa43ca..711e049 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,6 +1,8 @@
/* misc.c */
#include "misc.h"
+#include /* for rename() */
+#include /* for unlink(), acess() */
#include /* for calloc(), free() */
#include /* for strlen(), strcmp(), memcpy() */
#include /* for uint8_t */
@@ -133,17 +135,36 @@ extern void turn_over(struct World * world, char action)
extern void save_game(struct World * world)
{
- uint8_t err;
- FILE * file = fopen("savefile", "w");
- 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, "Error saving game.");
- fclose(file);
+ char * savefile_tmp = "savefile_tmp";
+ char * savefile = "savefile";
+ 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'.";
+ 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);
}