X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Frun.c;h=11735d02c8c8ea93c19c025f5dfe3bb5d4827b75;hb=96cdebb17848901906799677f45c67263f759f6a;hp=a1bf343b57599b9c66b384caf2351ce66273180f;hpb=81630285494cf6d9e5ddd845e4e55702d87029b0;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index a1bf343..11735d0 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -10,12 +10,13 @@
#include /* NULL */
#include /* uint8_t, uint16_t, uint32_t, int16_t */
#include /* FILE, printf(), fflush() */
-#include /* free() */
+#include /* atoi(), free() */
#include /* strlen(), strcmp(), strncmp(), strdup() */
#include /* time_t, time() */
#include /* access() */
#include "../common/parse_file.h" /* set_err_line_options(), token_from_line(),
- * err_line(), err_line_inc(), parse_val()
+ * err_line(), err_line_inc(), parse_val(),
+ * parestest_int()
*/
#include "../common/readwrite.h" /* try_fopen(), try_fcose(), try_fwrite(),
* try_fgets(), textfile_width(), try_fputc(),
@@ -25,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 */
@@ -207,23 +210,49 @@ static uint8_t parse_command_meta(char * tok0)
send_to_outfile("PONG\n", 1);
return 1;
}
- if (!strcmp("STACK", tok0))
+ if (!strcmp("THINGS_HERE", tok0))
{
- send_to_outfile("THINGS_BELOW_PLAYER START\n", 1);
- struct Thing * player = get_player();
- struct Thing * t;
- for (t = world.things; t; t = t->next)
+ char * tok1 = token_from_line(NULL);
+ char * tok2 = token_from_line(NULL);
+ if (tok1&&tok2 && !parsetest_int(tok1, '8')&&!parsetest_int(tok2, '8'))
{
- if ( t->pos.y == player->pos.y && t->pos.x == player->pos.x
- && t != player)
+ if (!world.exists)
+ {
+ err_line(1, "Command only works on existing worlds.");
+ return 0;
+ }
+ send_to_outfile("THINGS_HERE START\n", 1);
+ struct Thing * player = get_player();
+ 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)
+ {
+ 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 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);
+ }
+ }
}
+ send_to_outfile("THINGS_HERE END\n", 1);
+ return 1;
}
- send_to_outfile("THINGS_BELOW_PLAYER END\n", 1);
- return 1;
}
return 0;
}
@@ -299,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)
@@ -313,6 +344,7 @@ static void turn_over()
thing->command = 0;
thing->progress = 0;
}
+ hunger(thing);
}
try_thing_proliferation(thing);
}
@@ -407,7 +439,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);