X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Frun.c;h=11735d02c8c8ea93c19c025f5dfe3bb5d4827b75;hb=cee9a06bfd5a869797930f115d5653bc161359eb;hp=d88d583041b3f5007686d42a1ac02a383ee9d549;hpb=6c2654a6e4be4cdec81067002c667ade9895a82a;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index d88d583..11735d0 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -26,11 +26,13 @@
#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 "thing_actions.h" /* hunger(), try_healing() */
+#include "things.h" /* Thing, ThingType, ThingInMemory, get_player(),
+ * get_thing_action_id_by_name(), try_thing_proliferation()
*/
#include "world.h" /* world */
@@ -220,14 +222,32 @@ static uint8_t parse_command_meta(char * tok0)
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 (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);
@@ -308,12 +328,14 @@ static void turn_over()
{
if (0 == thing->command)
{
+ update_map_memory(thing);
if (thing == player)
{
break;
}
ai(thing);
}
+ try_healing(thing);
thing->progress++;
struct ThingAction * ta = get_thing_action(thing->command);
if (thing->progress == ta->effort)
@@ -322,6 +344,7 @@ static void turn_over()
thing->command = 0;
thing->progress = 0;
}
+ hunger(thing);
}
try_thing_proliferation(thing);
}