X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=c160e9fcea3d19900f1e9a7d6dabb285a88952c1;hb=0bc5f963f66050ed0018bf1228f5b17c686457c0;hp=83fc1a0f737963d5b17b7ceaa0e9d13507941af4;hpb=dd74c7f63defe31b7783f1ce2b2a96deba6d9690;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 83fc1a0..c160e9f 100644
--- 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() */
@@ -221,14 +222,31 @@ static uint8_t parse_command_meta(char * tok0)
}
send_to_outfile("THINGS_HERE START\n", 1);
struct Thing * player = get_player();
- struct ThingInMemory * t;
- for (t = player->t_mem; t; t = t->next)
+ if (player->fov_map &&
+ 'v' == player->fov_map[atoi(tok1)*world.map.length+atoi(tok2)])
{
- if (t->pos.y == atoi(tok1) && t->pos.x == atoi(tok2))
+ struct Thing * t;
+ for (t = world.things; t; t = t->next)
{
- struct ThingType * tt = get_thing_type(t->type);
- send_to_outfile(tt->name, 0);
- send_to_outfile("\n", 1);
+ if (t->pos.y == atoi(tok1) && t->pos.x == atoi(tok2))
+ {
+ struct ThingType * tt = get_thing_type(t->type);
+ send_to_outfile(tt->name, 0);
+ send_to_outfile("\n", 1);
+ }
+ }
+ }
+ else
+ {
+ struct ThingInMemory * t_mem;
+ for (t_mem = player->t_mem; t_mem; t_mem = t_mem->next)
+ {
+ 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);
@@ -309,6 +327,7 @@ static void turn_over()
{
if (0 == thing->command)
{
+ update_map_memory(thing);
if (thing == player)
{
break;