X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Finit.c;h=b63fbf96843dad69998e453fdf851b9a58db7ae0;hb=07514a620c4af0e3b43efffa90087594e4e62577;hp=97ed0fa09c0af955b835a2bd773436f4805255eb;hpb=316a56901b2249264b72992fd5aa63ce16fd3304;p=plomrogue diff --git a/src/server/init.c b/src/server/init.c index 97ed0fa..b63fbf9 100644 --- a/src/server/init.c +++ b/src/server/init.c @@ -6,7 +6,7 @@ #include /* exit(), free() */ #include /* atoi() */ #include /* time() */ -#include /* optarg, getopt(), access() */ +#include /* optarg, getopt(), access(), unlink() */ #include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_sizes(), * try_fgets() */ @@ -48,6 +48,7 @@ extern void obey_argv(int argc, char * argv[]) extern void remake_world(uint32_t seed) { + char * f_name = "remake_world()"; free(world.log); world.log = NULL; /* map_object_action.c's update_log() checks for this. */ world.seed = seed; @@ -56,7 +57,6 @@ extern void remake_world(uint32_t seed) free(world.map.cells); free_map_objects(world.map_objs); world.last_update_turn = 0; - world.turn = 1; init_map(); add_map_objects(0, 1); add_map_objects(1, 1 + rrand() % 27); @@ -65,6 +65,11 @@ extern void remake_world(uint32_t seed) add_map_objects(4, 1 + rrand() % 3); add_map_objects(5, 1 + rrand() % 3); set_cleanup_flag(CLEANUP_MAP_OBJECTS); + if (world.turn) + { + exit_trouble(unlink(world.path_record), f_name, "unlink()"); + } + world.turn = 1; }