X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=d88d583041b3f5007686d42a1ac02a383ee9d549;hb=6c2654a6e4be4cdec81067002c667ade9895a82a;hp=334fe410fcf9200713725ee2f8adcc81b22f2c53;hpb=08787351493beb2ad649e94d24eebca0e97192c8;p=plomrogue diff --git a/src/server/run.c b/src/server/run.c index 334fe41..d88d583 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -5,17 +5,18 @@ * see the file NOTICE in the root directory of the PlomRogue source package. */ -#define _POSIX_C_SOURCE 200809L +#define _POSIX_C_SOURCE 200809L /* strdup() */ #include "run.h" #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(), @@ -28,9 +29,9 @@ #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, get_thing_action_id_by_name(), get_player(), - * try_thing_proliferation() - */ +#include "things.h" /* Thing, ThingType, get_thing_action_id_by_name(), + * get_player(), try_thing_proliferation() + */ #include "world.h" /* world */ @@ -42,19 +43,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(); @@ -158,7 +161,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)) { @@ -194,6 +197,48 @@ 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("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 * 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); + } + } + send_to_outfile("THINGS_HERE END\n", 1); + return 1; + } + } + return 0; +} + + + static void server_test() { char test[10 + 1 + 10 + 1 + 1]; @@ -221,7 +266,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; } @@ -230,7 +275,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]) @@ -247,18 +292,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) @@ -289,6 +332,17 @@ static void turn_over() +extern void send_to_outfile(char * answer, uint8_t flush) +{ + try_fwrite(answer, strlen(answer), 1, world.file_out, __func__); + if (flush) + { + fflush(world.file_out); + } +} + + + extern void record(char * msg, uint8_t force) { static FILE * file_tmp = NULL; @@ -327,73 +381,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, "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) - { - continue; - } - if (world.is_verbose) - { - exit_trouble(-1 == printf("Input: %s\n", msg), __func__, "printf"); - } - if (!strcmp("QUIT", msg)) + if (msg) { + uint8_t ret = obey_msg(msg, obey_state); free(msg); - return 1; - } - if (!strcmp("PING", msg)) - { - free(msg); - char * pong = "PONG\n"; - try_fwrite(pong, strlen(pong), 1, world.file_out, __func__); - fflush(world.file_out); - continue; - } - if (world.replay) - { - free(msg); - return 0; + if ( (!world.replay && 2 == ret) + || ( world.replay && 2 <= ret)) + { + return ret; + } } - obey_msg(msg, 1, 0); - free(msg); } }