X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=11735d02c8c8ea93c19c025f5dfe3bb5d4827b75;hb=2abda4a2cf9ab42970b5fda00a433c7bcdb0f16e;hp=6f24f461d0c6d96ccf404574b8a8cc89d697dec7;hpb=b9c39db08e6187cc33ae9f308118249a5a33ba64;p=plomrogue diff --git a/src/server/run.c b/src/server/run.c index 6f24f46..11735d0 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -26,9 +26,11 @@ #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 "thing_actions.h" /* hunger(), try_healing() */ #include "things.h" /* Thing, ThingType, ThingInMemory, get_player(), * get_thing_action_id_by_name(), try_thing_proliferation() */ @@ -221,7 +223,8 @@ static uint8_t parse_command_meta(char * tok0) } send_to_outfile("THINGS_HERE START\n", 1); struct Thing * player = get_player(); - if ('v' == player->fov_map[atoi(tok1)*world.map.length+atoi(tok2)]) + if (player->fov_map && + 'v' == player->fov_map[atoi(tok1)*world.map.length+atoi(tok2)]) { struct Thing * t; for (t = world.things; t; t = t->next) @@ -325,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) @@ -339,6 +344,7 @@ static void turn_over() thing->command = 0; thing->progress = 0; } + hunger(thing); } try_thing_proliferation(thing); }