Server: Remove redundant setting of world.do_update.

[plomrogue] / src / server / init.c

diff --git a/src/server/init.c b/src/server/init.c
index aa5761cfff0cb40dbb5857209740d765f4e613df..093f1f5053905638ef2e5545a420db8bd707e1e2 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(), record() */
+#include "run.h" /* obey_msg(), io_loop(), record(), send_to_outfile() */
 #include "world.h" /* global world */
 
 
@@ -66,7 +71,7 @@ static void obey_lines_from_file(char * path, uint8_t record)
                 {
                     *nl = '\0';
                 }
-                obey_msg(line, record, 1);
+                obey_msg(line, record);
             }
             err_line_inc();
         }
@@ -86,18 +91,18 @@ static void replay_game()
     while (   world.turn < world.replay
            && try_fgets(line, linemax + 1, file, __func__))
     {
-        obey_msg(line, 0, 1);
+        obey_msg(line, 0);
         err_line_inc();
     }
     uint8_t end = 0;
-    while (!io_loop())
+    while (3 == io_loop(2))
     {
         if (!end)
         {
             end = (NULL == try_fgets(line, linemax + 1, file, __func__));
             if (!end)
             {
-                obey_msg(line, 0, 1);
+                obey_msg(line, 0);
                 err_line_inc();
             }
         }
@@ -191,8 +196,6 @@ 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();
@@ -221,8 +224,8 @@ extern uint8_t remake_world()
         }
     }
     world.turn = 1;
-    world.do_update = 1;
     world.exists = 1;
+    send_to_outfile("NEW_WORLD\n", 1);
     return 0;
 }
 
@@ -252,10 +255,10 @@ extern void run_game()
         char * msg = try_malloc(strlen(command) + 1 + 11 + 1, __func__);
         int test = sprintf(msg, "%s %d", command, (int) time(NULL));
         exit_trouble(test < 0, __func__, s[S_FCN_SPRINTF]);
-        obey_msg(msg, 1, 1);
+        obey_msg(msg, 1);
         free(msg);
     }
     err_line_zero();
-    io_loop();
+    io_loop(1);
     record(NULL, 1);
 }