X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Frun.c;h=38dc5a04174edc6b68832f227cbb40f9a7a2ac8d;hb=6a9f579e2c47c5d60b37d343465e08faf26a9255;hp=9163ee05b4d125d22040be802ee44ba02e096c9e;hpb=b774672163cc6a1ad21b4958d3b2e8b903cd0ba2;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 9163ee0..38dc5a0 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -26,11 +26,12 @@
#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() */
-#include "things.h" /* Thing, ThingType, get_thing_action_id_by_name(),
- * get_player(), try_thing_proliferation()
+#include "things.h" /* Thing, ThingType, ThingInMemory, get_player(),
+ * get_thing_action_id_by_name(), try_thing_proliferation()
*/
#include "world.h" /* world */
@@ -214,15 +215,37 @@ static uint8_t parse_command_meta(char * tok0)
char * tok2 = token_from_line(NULL);
if (tok1&&tok2 && !parsetest_int(tok1, '8')&&!parsetest_int(tok2, '8'))
{
+ if (!world.exists)
+ {
+ err_line(1, "Command only works on existing worlds.");
+ return 0;
+ }
send_to_outfile("THINGS_HERE START\n", 1);
- struct Thing * t;
- for (t = world.things; t; t = t->next)
+ struct Thing * player = get_player();
+ if ('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);
@@ -303,6 +326,7 @@ static void turn_over()
{
if (0 == thing->command)
{
+ update_map_memory(thing);
if (thing == player)
{
break;
@@ -411,7 +435,7 @@ extern uint8_t obey_msg(char * msg, uint8_t obey_state)
}
else if (!world.replay)
{
- err_line(1, "Unknown command/argument or bad number of tokens.");
+ err_line(1, "Invalid command/argument or bad number of tokens.");
}
}
free(msg_copy);