#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() */
+#include "things.h" /* Thing, ThingType, ThingInMemory, get_player(),
+ * get_thing_action_id_by_name(), try_thing_proliferation()
*/
#include "world.h" /* world */
{
char * tok1 = token_from_line(NULL);
char * tok2 = token_from_line(NULL);
- if (!parsetest_int(tok1, '8') && !parsetest_int(tok2, '8'))
+ 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 (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);
{
if (0 == thing->command)
{
+ update_map_memory(thing);
if (thing == player)
{
break;
thing->command = 0;
thing->progress = 0;
}
+ hunger(thing);
}
try_thing_proliferation(thing);
}
}
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);