On world (re-)generation, server sends 'NEW_WORLD', client clears log.

[plomrogue] / src / server / init.c

diff --git a/src/server/init.c b/src/server/init.c
index 01950bcac3111f455dabd97eb515090e8c89d3e2..f4c191b8c72ff52d8a6bbe05d509ac33fa14a341 100644 (file)
--- a/src/server/init.c
+++ b/src/server/init.c
@@ -1,4 +1,9 @@
-/* src/server/init.c */
+/* src/server/init.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
 
 #define _POSIX_C_SOURCE 2 /* getopt(), optarg */
 #include "init.h"
@@ -26,7 +31,7 @@
 #include "things.h" /* Thing, ThingType, free_things(), add_things(),
                      * get_thing_id_action_id_by_name()
                      */
-#include "run.h" /* obey_msg(), io_loop() */
+#include "run.h" /* obey_msg(), io_loop(), record(), send_to_outfile() */
 #include "world.h" /* global world */
 
 
@@ -55,7 +60,7 @@ static void obey_lines_from_file(char * path, uint8_t record)
     FILE * file = try_fopen(path, "r", __func__);
     uint32_t linemax = textfile_width(file);
     char * line = try_malloc(linemax + 1, __func__);
-    while (NULL != try_fgets(line, linemax + 1, file, __func__))
+    while (try_fgets(line, linemax + 1, file, __func__))
     {
         if (strlen(line))
         {
@@ -84,7 +89,7 @@ static void replay_game()
     uint32_t linemax = textfile_width(file);
     char * line = try_malloc(linemax + 1, __func__);
     while (   world.turn < world.replay
-           && NULL != try_fgets(line, linemax + 1, file, __func__))
+           && try_fgets(line, linemax + 1, file, __func__))
     {
         obey_msg(line, 0, 1);
         err_line_inc();
@@ -112,7 +117,7 @@ static uint8_t world_cannot_be_made()
 {
     uint8_t player_will_be_generated = 0;
     struct ThingType * tt;
-    for (tt = world.thing_types; NULL != tt; tt = tt->next)
+    for (tt = world.thing_types; tt; tt = tt->next)
     {
         if (world.player_type == tt->id)
         {
@@ -191,13 +196,11 @@ extern uint8_t remake_world()
     {
         return test;
     }
-    free(world.log);
-    world.log = NULL;      /* thing_actions.c's update_log() checks for this. */
     world.seed_map = world.seed;
     free_things(world.things);
     remake_map();
     struct ThingType * tt;
-    for (tt = world.thing_types; NULL != tt; tt = tt->next)
+    for (tt = world.thing_types; tt; tt = tt->next)
     {
         if (world.player_type == tt->id)
         {
@@ -205,7 +208,7 @@ extern uint8_t remake_world()
             break;
         }
     }
-    for (tt = world.thing_types; NULL != tt; tt = tt->next)
+    for (tt = world.thing_types; tt; tt = tt->next)
     {
         if (world.player_type != tt->id)
         {
@@ -213,13 +216,17 @@ extern uint8_t remake_world()
         }
     }
     struct Thing * t;
-    for (t = world.things; NULL != t; t = t->next)
+    for (t = world.things; t; t = t->next)
     {
-        t->fov_map = t->lifepoints ? build_fov_map(t) : NULL;
+        if (t->lifepoints)
+        {
+            build_fov_map(t);
+        }
     }
     world.turn = 1;
     world.do_update = 1;
     world.exists = 1;
+    send_to_outfile("NEW_WORLD\n");
     return 0;
 }
 
@@ -254,4 +261,5 @@ extern void run_game()
     }
     err_line_zero();
     io_loop();
+    record(NULL, 1);
 }