Server: Decouple update_map_memory() and build_fov_map(), thus fix bugs.

[plomrogue] / src / server / run.c

diff --git a/src/server/run.c b/src/server/run.c
index 9f6afbb29f33dcc14b56acb7c997dcd7c4a29960..38dc5a04174edc6b68832f227cbb40f9a7a2ac8d 100644 (file)
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -26,6 +26,7 @@
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "ai.h" /* ai() */
 #include "cleanup.h" /* unset_cleanup_flag() */
+#include "field_of_view.h" /* update_map_memory() */
 #include "god_commands.h" /* parse_god_command_(1|2|3)arg() */
 #include "hardcoded_strings.h" /* s */
 #include "io.h" /* io_round(), save_world() */
@@ -234,14 +235,17 @@ static uint8_t parse_command_meta(char * tok0)
                     }
                 }
             }
-            struct ThingInMemory * t_mem;
-            for (t_mem = player->t_mem; t_mem; t_mem = t_mem->next)
+            else
             {
-                if (t_mem->pos.y == atoi(tok1) && t_mem->pos.x == atoi(tok2))
+                struct ThingInMemory * t_mem;
+                for (t_mem = player->t_mem; t_mem; t_mem = t_mem->next)
                 {
-                    struct ThingType * tt = get_thing_type(t_mem->type);
-                    send_to_outfile(tt->name, 0);
-                    send_to_outfile("\n", 1);
+                    if (t_mem->pos.y == atoi(tok1) && t_mem->pos.x == atoi(tok2))
+                    {
+                        struct ThingType * tt = get_thing_type(t_mem->type);
+                        send_to_outfile(tt->name, 0);
+                        send_to_outfile("\n", 1);
+                    }
                 }
             }
             send_to_outfile("THINGS_HERE END\n", 1);
@@ -322,6 +326,7 @@ static void turn_over()
             {
                 if (0 == thing->command)
                 {
+                    update_map_memory(thing);
                     if (thing == player)
                     {
                         break;