From 784a0781dd6c5eb63a90bf04524398ceec12b174 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Sun, 7 Dec 2014 04:16:30 +0100 Subject: [PATCH] Server: Add animate things in field of view to THINGS_HERE results. --- SERVER_COMMANDS | 7 ++++--- src/server/run.c | 21 +++++++++++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/SERVER_COMMANDS b/SERVER_COMMANDS index 04092ac..c43efed 100644 --- a/SERVER_COMMANDS +++ b/SERVER_COMMANDS @@ -54,9 +54,10 @@ QUIT Shut down server. THINGS_HERE [0 to 255] [0 to 255] -If world exists, write line-by-line list of things in memory at y position of -first argument, x position of second argument of map into ./server/out file, -enclosed by two lines "THINGS_HERE START" and "THINGS_HERE END". +If world exists, write line-by-line list of things visible or in memory at y +position of first argument, x position of second argument of map into +./server/out file, enclosed by two lines "THINGS_HERE START" and +"THINGS_HERE END". Player commands --------------- diff --git a/src/server/run.c b/src/server/run.c index 83fc1a0..9f6afbb 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -221,12 +221,25 @@ 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 ('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); + 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); + } + } + } + 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); } -- 2.30.2