#include <stddef.h> /* NULL */
#include <stdint.h> /* uint8_t, uint16_t, uint32_t, int16_t */
#include <stdio.h> /* FILE, printf(), fflush() */
-#include <stdlib.h> /* free() */
+#include <stdlib.h> /* atoi(), free() */
#include <string.h> /* strlen(), strcmp(), strncmp(), strdup() */
#include <time.h> /* time_t, time() */
#include <unistd.h> /* 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(),
#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 */
/* Return 1 on world.exists, else 0 and err_line() appropriate error message. */
static uint8_t player_commands_allowed();
-/* Parse player command "tok0" with no argument to player action. */
+/* Parse player commands "tok0" with optional argument "tok1" to player action.
+ * Return 1 on success, 0 on failure.
+ */
static uint8_t parse_player_command_0arg(char * tok0);
-
-/* Parse player command "tok0" with one argument "tok1" to player action. */
static uint8_t parse_player_command_1arg(char * tok0, char * tok1);
-/* Parse/apply command "tok0" (read further tokens as necessary). */
-static uint8_t parse_command(char * tok0);
+/* Parse/apply (non-)meta command "tok0" (read further tokens as necessary).
+ * Return 0 on failure, 1 on success, 2 on QUIT meta command.
+ */
+static uint8_t parse_command_nonmeta(char * tok0);
+static uint8_t parse_command_meta(char * tok0);
-/* Compares first line of server out file to world.server_test, aborts if they
- * don't match, but not before unsetting the flags deleting files in the server
- * directory, for in that case those must be assumed to belong to another server
- * process.
+/* Compare 1st line of server out file to world.server_test, abort if they don't
+ * match, but not before unsetting flags deleting files in the server directory,
+ * for in that case those must be assumed to belong to another server process.
*/
static void server_test();
*/
static void turn_over();
-/* Append "answer" to server output file, with instant fflush(). */
-static void answer_query(char * answer);
-
-/* Try to read "msg" as meta command, act accordingly; on success, free it. */
-static uint8_t meta_commands(char * msg);
-
static uint8_t set_char_by_string_comparison(char * string, char * comparand,
else
{
player->command = get_thing_action_id_by_name(tok0);
- player->arg = 0;
}
turn_over();
}
-static uint8_t parse_command(char * tok0)
+static uint8_t parse_command_nonmeta(char * tok0)
{
if (parse_player_command_0arg(tok0))
{
+static uint8_t parse_command_meta(char * tok0)
+{
+ if (!strcmp("QUIT", tok0))
+ {
+ return 2;
+ }
+ if (!strcmp("PING", tok0))
+ {
+ send_to_outfile("PONG\n", 1);
+ return 1;
+ }
+ if (!strcmp("THINGS_HERE", tok0))
+ {
+ char * tok1 = token_from_line(NULL);
+ char * tok2 = token_from_line(NULL);
+ 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 * 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 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;
+ }
+ }
+ return 0;
+}
+
+
+
static void server_test()
{
char test[10 + 1 + 10 + 1 + 1];
{
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)
thing->command = 0;
thing->progress = 0;
}
+ hunger(thing);
}
try_thing_proliferation(thing);
}
-static void answer_query(char * answer)
+extern void send_to_outfile(char * answer, uint8_t flush)
{
try_fwrite(answer, strlen(answer), 1, world.file_out, __func__);
- fflush(world.file_out);
-}
-
-
-
-static uint8_t meta_commands(char * msg)
-{
- if (!strcmp("QUIT", msg))
+ if (flush)
{
- free(msg);
- return 2;
+ fflush(world.file_out);
}
- if (!strcmp("PING", msg))
- {
- free(msg);
- answer_query("PONG\n");
- return 1;
- }
- if (!strcmp("STACK", msg))
- {
- free(msg);
- answer_query("THINGS_BELOW_PLAYER START\n");
- struct Thing * player = get_player();
- struct Thing * t;
- for (t = world.things; t; t = t->next)
- {
- if ( t->pos.y == player->pos.y && t->pos.x == player->pos.x
- && t != player)
- {
- struct ThingType * tt = get_thing_type(t->type);
- answer_query(tt->name);
- answer_query("\n");
- }
- }
- answer_query("THINGS_BELOW_PLAYER END\n");
- return 1;
- }
- return 0;
}
-extern void obey_msg(char * msg, uint8_t do_record, uint8_t do_verbose)
+extern uint8_t obey_msg(char * msg, uint8_t obey_state)
{
- if (world.is_verbose && do_verbose)
+ if (world.is_verbose)
{
exit_trouble(-1 == printf("Input: %s\n", msg), __func__, "printf");
}
set_err_line_options("Trouble with message: ", msg, 0);
char * msg_copy = strdup(msg);
char * tok0 = token_from_line(msg_copy);
+ uint8_t ret = 0;
if (tok0)
{
-
- if (parse_command(tok0))
+ ret = parse_command_meta(tok0);
+ if (ret || (obey_state < 2 && parse_command_nonmeta(tok0)))
{
- if (world.exists)
- {
- world.do_update = 1;
- }
- if (do_record)
+ if (!ret)
{
- record(msg, 0);
+ if (world.exists)
+ {
+ world.do_update = 1;
+ }
+ if (1 == obey_state)
+ {
+ record(msg, 0);
+ }
}
char * tokplus = token_from_line(NULL);
err_line(!(!tokplus), "Too many arguments, ignoring overflow.");
- free(msg_copy);
- return;
+ }
+ else if (world.replay)
+ {
+ ret = 3;
+ }
+ else if (!world.replay)
+ {
+ err_line(1, "Invalid command/argument or bad number of tokens.");
}
}
- err_line(1, "Unknown command/argument or bad number of tokens.");
free(msg_copy);
+ return ret;
}
-extern uint8_t io_loop()
+extern uint8_t io_loop(uint8_t obey_state)
{
while (1)
{
char * msg = io_round();
server_test();
- if (!msg)
+ if (msg)
{
- continue;
- }
- if (world.is_verbose)
- {
- exit_trouble(-1 == printf("Input: %s\n", msg), __func__, "printf");
- }
- uint8_t test = meta_commands(msg);
- if (test)
- {
- if (2 == test)
+ uint8_t ret = obey_msg(msg, obey_state);
+ free(msg);
+ if ( (!world.replay && 2 == ret)
+ || ( world.replay && 2 <= ret))
{
- return 1;
+ return ret;
}
- continue;
- }
- if (world.replay)
- {
- free(msg);
- return 0;
}
- obey_msg(msg, 1, 0);
- free(msg);
}
}
projects / plomrogue / blobdiff