X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=a1bf343b57599b9c66b384caf2351ce66273180f;hb=81630285494cf6d9e5ddd845e4e55702d87029b0;hp=808be55398a3a03e7f1d69d67c104d3850ebaffd;hpb=a9377a5125c28779f812f859564d4f4d0b744e89;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 808be55..a1bf343 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -42,19 +42,21 @@ static uint8_t set_char_by_string_comparison(char * string, char * comparand,
/* 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();
@@ -71,12 +73,6 @@ static uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist);
*/
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,
@@ -164,7 +160,7 @@ static uint8_t parse_player_command_1arg(char * tok0, char * tok1)
-static uint8_t parse_command(char * tok0)
+static uint8_t parse_command_nonmeta(char * tok0)
{
if (parse_player_command_0arg(tok0))
{
@@ -200,6 +196,40 @@ static uint8_t parse_command(char * 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("STACK", 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)
+ {
+ if ( t->pos.y == player->pos.y && t->pos.x == player->pos.x
+ && t != player)
+ {
+ struct ThingType * tt = get_thing_type(t->type);
+ send_to_outfile(tt->name, 0);
+ send_to_outfile("\n", 1);
+ }
+ }
+ send_to_outfile("THINGS_BELOW_PLAYER END\n", 1);
+ return 1;
+ }
+ return 0;
+}
+
+
+
static void server_test()
{
char test[10 + 1 + 10 + 1 + 1];
@@ -227,7 +257,7 @@ static int16_t * build_whitelist()
for (; t; t = t->next, i_things++);
int16_t * whitelist = try_malloc(i_things * sizeof(int16_t), __func__);
for (i_things = 0, t = world.things; t;
- whitelist[i_things] = t->id, t = t->next, i_things++)
+ whitelist[i_things] = t->id, t = t->next, i_things++);
whitelist[i_things] = -1;
return whitelist;
}
@@ -236,7 +266,7 @@ static int16_t * build_whitelist()
static uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist)
{
- int16_t i;
+ uint16_t i;
for (i = 0; -1 < whitelist[i]; i++)
{
if ((int16_t) id == whitelist[i])
@@ -253,18 +283,16 @@ static void turn_over()
{
struct Thing * player = get_player();
struct Thing * thing = player;
- uint16_t start_turn = world.turn;
int16_t * whitelist = build_whitelist();
- while ( 0 < player->lifepoints
- || (0 == player->lifepoints && start_turn == world.turn))
- { /* TODO: check meaning and refactorability of 2nd condition */
+ while (0 < player->lifepoints)
+ {
if (!thing)
{
world.turn++;
thing = world.things;
free(whitelist);
- whitelist = build_whitelist();
- }
+ whitelist = build_whitelist();/* The whitelist excludes things */
+ } /* that appear only during the turn.*/
if (thing_in_whitelist(thing->id, whitelist))
{
if (0 < thing->lifepoints)
@@ -295,47 +323,13 @@ static void turn_over()
-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))
- {
- free(msg);
- return 2;
- }
- if (!strcmp("PING", msg))
+ if (flush)
{
- free(msg);
- answer_query("PONG\n");
- return 1;
+ fflush(world.file_out);
}
- 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;
}
@@ -378,69 +372,65 @@ extern void record(char * msg, uint8_t force)
-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, "Unknown 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);
}
}