X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Finit.c;h=b63fbf96843dad69998e453fdf851b9a58db7ae0;hb=e03020342a74aef143b1ec38c18966dac64181b5;hp=f6b56a631dfa8199642ba674c2e9ced14c1b8738;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue

diff --git a/src/server/init.c b/src/server/init.c
index f6b56a6..b63fbf9 100644
--- a/src/server/init.c
+++ b/src/server/init.c
@@ -1,11 +1,12 @@
 /* src/server/init.c */
 
 #include "init.h"
+#include <stddef.h> /* NULL */
 #include <stdint.h> /* uint32_t */
 #include <stdlib.h> /* exit(), free() */
 #include <string.h> /* atoi() */
 #include <time.h> /* time() */
-#include <unistd.h> /* optarg, getopt(), access() */
+#include <unistd.h> /* optarg, getopt(), access(), unlink() */
 #include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_sizes(),
                                   * try_fgets()
                                   */
@@ -47,18 +48,15 @@ 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;
+    world.log = NULL;  /* map_object_action.c's update_log() checks for this. */
     world.seed = seed;
     world.map_obj_count = 0;
     world.score = 0;
     free(world.map.cells);
-    if (world.map_objs)
-    {
-        free_map_objects(world.map_objs);
-    }
+    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);
@@ -67,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;
 }