X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=11735d02c8c8ea93c19c025f5dfe3bb5d4827b75;hb=f86e20aec4f9c6f07322954569a72221d7dc11e9;hp=3f1b1e39aa9893f716e06557eb4d8d301dc2a9c5;hpb=27f8cdc988b4bbd92d9d0daee7019461c690008e;p=plomrogue diff --git a/src/server/run.c b/src/server/run.c index 3f1b1e3..11735d0 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -1,93 +1,89 @@ -/* src/server/run.c */ +/* src/server/run.c + * + * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 + * or any later version. For details on its copyright, license, and warranties, + * 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 */ +#include /* uint8_t, uint16_t, uint32_t, int16_t */ #include /* FILE, printf(), fflush() */ -#include /* free(), atoi() */ -#include /* strlen(), strcmp() strncmp(), strdup() */ +#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(), err_line_inc(), parse_val(), + * parestest_int() */ #include "../common/readwrite.h" /* try_fopen(), try_fcose(), try_fwrite(), - * try_fgets(), textfile_width(), try_fputc() + * try_fgets(), textfile_width(), try_fputc(), + * atomic_write_finish(), build_temp_path() */ #include "../common/rexit.h" /* exit_trouble(), exit_err() */ #include "../common/try_malloc.h" /* try_malloc() */ #include "ai.h" /* ai() */ -#include "cleanup.h" /* set_cleanup_flag(), unset_cleanup_flag() */ -#include "field_of_view.h" /* build_fov_map() */ +#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 "init.h" /* remake_world() */ #include "io.h" /* io_round(), save_world() */ -#include "map.h" /* remake_map() */ -#include "thing_actions.h" /* ThingAction */ -#include "things.h" /* Thing, get_thing(), own_thing(), add_thing(), - * get_thing_action_id_by_name(), get_player() +#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" /* global world */ - - +#include "world.h" /* world */ -/* Parse/apply god command in "tok0"/"tok1" on "t" owning another thing. */ -static uint8_t parse_carry(char * tok0, char * tok1, struct Thing * t); -/* Parse/apply god commansd in "tok0"/"tok1" on positioning a thing "t". */ -static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t); -/* Parse/apply god command in "tok0"/"tok1" oo setting "t"'s thing type. */ -static uint8_t parse_thing_type(char * tok0, char * tok1, struct Thing * t); +/* If "string" and "comparand" match in string, set "c_to_set" to value." */ +static uint8_t set_char_by_string_comparison(char * string, char * comparand, + char * c_to_set, char value); -/* Parse/apply god command in "tok0"/"tok1" on setting up thing "t". */ -static uint8_t parse_thing_command(char * tok0, char * tok1, struct Thing * t); +/* Return 1 on world.exists, else 0 and err_line() appropriate error message. */ +static uint8_t player_commands_allowed(); -/* Parse/apply god command on enabling/disabling generation of fields of view on - * god commands that may affect them, via static global "do_fov". On enabling, - * (re-)generate all animate things' fields of view. +/* Parse player commands "tok0" with optional argument "tok1" to player action. + * Return 1 on success, 0 on failure. */ -static uint8_t parse_do_fov(char * tok0, char * tok1); +static uint8_t parse_player_command_0arg(char * tok0); +static uint8_t parse_player_command_1arg(char * tok0, char * tok1); -/* Parse/apply god command in "tok0"/"tok1" manipulating a thing's state. */ -static uint8_t parse_thing_manipulation(char * tok0, char * tok1); - -/* Parse player command in "tok0"/"tok1" to action in player thing. */ -static uint8_t parse_player_command(char * tok0, char * tok1); +/* 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(); +/* Return array of IDs of non-owned things in game world, ended by non-ID -1. */ +static int16_t * build_whitelist(); + +/* Return 1 if value of "id" appears in "whitelist", else 0. */ +static uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist); + /* Run the game world and its inhabitants (and their actions) until the player - * avatar is free to receive new commands (or is dead). + * avatar is free to receive new commands (or is dead). Only actions and + * proliferations for non-owned things are performed that exist at the start of + * the turn jumped into, or started anew by the cycle. */ static void turn_over(); -/* Do god commands to create / position things generate their fields of view? */ -static uint8_t do_fov = 0; - - - -static uint8_t parse_carry(char * tok0, char * tok1, struct Thing * t) +static uint8_t set_char_by_string_comparison(char * string, char * comparand, + char * c_to_set, char value) { - uint8_t id; - if (parse_val(tok0, tok1, s[S_CMD_CARRIES], '8', (char *) &id)) + if (!strcmp(string, comparand)) { - if (!err_line(id == t->id, "Thing cannot carry itself.")) - { - struct Thing * o = get_thing(world.things, id, 0); - if (!err_line(!o, "Thing cannot carry thing that does not exist.")) - { - own_thing(&(t->owns), &world.things, id); - o->pos = t->pos; - } - } + * c_to_set = value; return 1; } return 0; @@ -95,33 +91,35 @@ static uint8_t parse_carry(char * tok0, char * tok1, struct Thing * t) -static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t) +static uint8_t player_commands_allowed() { - char axis = 0; - if (!strcmp(tok0, s[S_CMD_POS_Y])) - { - axis = 'y'; - } - else if (!strcmp(tok0, s[S_CMD_POS_X])) + if (!world.exists) { - axis = 'x'; + return !err_line(1, "No world exists in which to run player commands."); } - if (axis && !parsetest_int(tok1, '8')) + return 1; +} + + + +static uint8_t parse_player_command_0arg(char * tok0) +{ + struct Thing * player = get_player(); + if ( !strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP]) + || !strcmp(tok0, s[S_CMD_AI])) { - uint8_t length = atoi(tok1); - char * err = "Position is outside of map."; - if (!err_line(length >= world.map.length, err)) + if (player_commands_allowed()) { - if ('y' == axis) + if (!strcmp(tok0, s[S_CMD_AI])) { - t->pos.y = length; + ai(player); } - else if ('x' == axis) + else { - t->pos.x = length; + player->command = get_thing_action_id_by_name(tok0); + player->arg = 0; } - free(t->fov_map); - t->fov_map= do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map; + turn_over(); } return 1; } @@ -130,135 +128,182 @@ static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t) -static uint8_t parse_thing_type(char * tok0, char * tok1, struct Thing * t) +static uint8_t parse_player_command_1arg(char * tok0, char * tok1) { - uint8_t type; - if (parse_val(tok0, tok1, s[S_CMD_TYPE], '8', (char *) &type)) + struct Thing * player = get_player(); + if ( ( parse_val(tok0, tok1, s[S_CMD_DROP], '8', (char *) &player->arg) + || parse_val(tok0, tok1, s[S_CMD_USE], '8', (char *) &player->arg)) + && player_commands_allowed()) + { + player->command = get_thing_action_id_by_name(tok0); + turn_over(); + } + else if (!strcmp(tok0, s[S_CMD_MOVE]) && player_commands_allowed()) { - struct ThingType * tt = world.thing_types; - for (; NULL != tt && type != tt->id; tt = tt->next); - if (!err_line(!tt, "Thing type does not exist.")) + char dir = '\0'; + if (!( set_char_by_string_comparison(tok1, "east", &dir, 'd') + || set_char_by_string_comparison(tok1, "south-east", &dir, 'c') + || set_char_by_string_comparison(tok1, "south-west", &dir, 'x') + || set_char_by_string_comparison(tok1, "west", &dir, 's') + || set_char_by_string_comparison(tok1, "north-west", &dir, 'w') + || set_char_by_string_comparison(tok1, "north-east", &dir, 'e'))) { - t->type = type; + return 0; } - return 1; + player->arg = dir; + player->command = get_thing_action_id_by_name(tok0); + turn_over(); } - return 0; + else + { + return 0; + } + return 1; } -static uint8_t parse_thing_command(char * tok0, char * tok1, struct Thing * t) +static uint8_t parse_command_nonmeta(char * tok0) { - uint8_t command; - if (parse_val(tok0, tok1, s[S_CMD_COMMAND], '8', (char *) &command)) + if (parse_player_command_0arg(tok0)) + { + return 1; + } + else { - if (!command) + char * tok1 = token_from_line(NULL); + if (tok1 && ( parse_player_command_1arg(tok0, tok1) + || parse_god_command_1arg(tok0, tok1))) { - t->command = command; return 1; } - struct ThingAction * ta = world.thing_actions; - for (; NULL != ta && command != ta->id; ta = ta->next); - if (!err_line(!ta, "Thing action does not exist.")) + else { - t->command = command; + char * tok2 = token_from_line(NULL); + if (tok2 && parse_god_command_2arg(tok0, tok1, tok2)) + { + return 1; + } + else + { + char * tok3 = token_from_line(NULL); + if (tok2 && parse_god_command_3arg(tok0, tok1, tok2, tok3)) + { + return 1; + } + } } - return 1; } return 0; } -static uint8_t parse_do_fov(char * tok0, char * tok1) +static uint8_t parse_command_meta(char * tok0) { - if (parse_val(tok0, tok1, s[S_CMD_DO_FOV], '8', (char *) &do_fov)) + if (!strcmp("QUIT", tok0)) + { + return 2; + } + if (!strcmp("PING", tok0)) { - if (do_fov) + 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')) { - struct Thing * ti; - for (ti = world.things; ti; ti = ti->next) + 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 { - ti->fov_map = ti->lifepoints ? build_fov_map(ti) : ti->fov_map; + 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 1; } return 0; } -static uint8_t parse_thing_manipulation(char * tok0, char * tok1) +static void server_test() { - uint8_t id; - static struct Thing * t = NULL; - if (t && ( parse_thing_type(tok0, tok1, t) - || parse_thing_command(tok0, tok1, t) - || parse_val(tok0, tok1, s[S_CMD_ARGUMENT], '8', (char *)&t->arg) - || parse_val(tok0,tok1,s[S_CMD_PROGRESS],'8',(char *)&t->progress) - || parse_val(tok0, tok1, s[S_CMD_LIFEPOINTS], '8', - (char *) &t->lifepoints) - || parse_position(tok0, tok1, t) - || parse_carry(tok0, tok1, t))); - else if (parse_val(tok0, tok1, s[S_CMD_THING], '8', (char *) &id)) - { - t = get_thing(world.things, id, 1); - if (!t) - { - t = add_thing(id, 0, 0); - set_cleanup_flag(CLEANUP_THINGS); - t->fov_map= do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map; - } - } - else + char test[10 + 1 + 10 + 1 + 1]; + FILE * file = try_fopen(s[S_PATH_OUT], "r", __func__); + try_fgets(test, 10 + 10 + 1 + 1, file, __func__); + try_fclose(file, __func__); + if (strcmp(test, world.server_test)) { - return 0; + unset_cleanup_flag(CLEANUP_WORLDSTATE); + unset_cleanup_flag(CLEANUP_OUT); + unset_cleanup_flag(CLEANUP_IN); + char * msg = "Server test string in server output file does not match. " + "This indicates that the current server process has been " + "superseded by another one."; + exit_err(1, msg); } - return 1; } -static uint8_t parse_player_command(char * tok0, char * tok1) +static int16_t * build_whitelist() { - struct Thing * player = get_player(); - if ( parse_val(tok0, tok1, s[S_CMD_WAIT], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[S_CMD_MOVE], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[S_CMD_PICKUP], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[S_CMD_DROP], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[S_CMD_USE], '8', (char *) &player->arg)) - { - player->command = get_thing_action_id_by_name(tok0); - turn_over(); - } - else - { - return 0; - } - return 1; + uint16_t i_things = NULL != world.things; + struct Thing * t = world.things; + 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] = -1; + return whitelist; } -static void server_test() +static uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist) { - char * f_name = "server_test()"; - char test[10 + 1 + 10 + 1 + 1]; - FILE * file = try_fopen(s[S_PATH_OUT], "r", f_name); - try_fgets(test, 10 + 10 + 1 + 1, file, f_name); - try_fclose(file, f_name); - if (strcmp(test, world.server_test)) + uint16_t i; + for (i = 0; -1 < whitelist[i]; i++) { - unset_cleanup_flag(CLEANUP_WORLDSTATE); - unset_cleanup_flag(CLEANUP_OUT); - unset_cleanup_flag(CLEANUP_IN); - char * msg = "Server test string in server output file does not match. " - "This indicates that the current server process has been " - "superseded by another one."; - exit_err(1, msg); + if ((int16_t) id == whitelist[i]) + { + return 1; + } } + return 0; } @@ -267,144 +312,157 @@ static void turn_over() { struct Thing * player = get_player(); struct Thing * thing = player; - uint16_t start_turn = world.turn; - while ( 0 < player->lifepoints - || (0 == player->lifepoints && start_turn == world.turn)) + int16_t * whitelist = build_whitelist(); + while (0 < player->lifepoints) { - if (NULL == thing) + if (!thing) { world.turn++; thing = world.things; - } - if (0 < thing->lifepoints) + free(whitelist); + whitelist = build_whitelist();/* The whitelist excludes things */ + } /* that appear only during the turn.*/ + if (thing_in_whitelist(thing->id, whitelist)) { - if (0 == thing->command) + if (0 < thing->lifepoints) { - if (thing == player) + if (0 == thing->command) { - break; + update_map_memory(thing); + if (thing == player) + { + break; + } + ai(thing); } - ai(thing); - } - thing->progress++; - struct ThingAction * ta = world.thing_actions; - while (ta->id != thing->command) - { - ta = ta->next; - } - if (thing->progress == ta->effort) - { - ta->func(thing); - thing->command = 0; - thing->progress = 0; + try_healing(thing); + thing->progress++; + struct ThingAction * ta = get_thing_action(thing->command); + if (thing->progress == ta->effort) + { + ta->func(thing); + thing->command = 0; + thing->progress = 0; + } + hunger(thing); } + try_thing_proliferation(thing); } thing = thing->next; } + free(whitelist); } -static void record_msg(char * msg) +extern void send_to_outfile(char * answer, uint8_t flush) { - char * f_name = "record_msg()"; - char * path_tmp; - FILE * file_tmp = atomic_write_start(s[S_PATH_RECORD], &path_tmp); - if (!access(s[S_PATH_RECORD], F_OK)) + try_fwrite(answer, strlen(answer), 1, world.file_out, __func__); + if (flush) { - FILE * file_read = try_fopen(s[S_PATH_RECORD], "r", f_name); - uint32_t linemax = textfile_width(file_read); - char * line = try_malloc(linemax + 1, f_name); - while (try_fgets(line, linemax + 1, file_read, f_name)) - { - try_fwrite(line, strlen(line), 1, file_tmp, f_name); - } - free(line); - try_fclose(file_read, f_name); + fflush(world.file_out); } - try_fwrite(msg, strlen(msg), 1, file_tmp, f_name); - try_fputc('\n', file_tmp, f_name); - atomic_write_finish(file_tmp, s[S_PATH_RECORD], path_tmp); } -extern void obey_msg(char * msg, uint8_t do_record) +extern void record(char * msg, uint8_t force) { - set_err_line_options("Trouble with message: ", msg, 0, 0); - char * msg_copy = strdup(msg); - char * tok0 = token_from_line(msg_copy); - char * tok1 = token_from_line(NULL); - char * tok2 = token_from_line(NULL); - if (err_line(!(tok0 && tok1) || tok2, "Bad number of tokens.")) + static FILE * file_tmp = NULL; + static time_t save_wait = 0; + static char * path_tmp; + if (!file_tmp) { - return; - } - if ( parse_thing_manipulation(tok0, tok1) - || parse_player_command(tok0, tok1) - || parse_val(tok0, tok1, s[S_CMD_SEED_RAND], 'U', (char *) &world.seed) - || parse_val(tok0, tok1, s[S_CMD_TURN], 'u', (char *) &world.turn) - || parse_do_fov(tok0, tok1)); - else if (parse_val(tok0,tok1,s[S_CMD_SEED_MAP],'U',(char *)&world.seed_map)) - - { - remake_map(); - } - else if (parse_val(tok0, tok1, s[S_CMD_MAKE_WORLD],'U',(char *)&world.seed)) - { - remake_world(); + path_tmp = build_temp_path(s[S_PATH_RECORD]); + file_tmp = try_fopen(path_tmp, "w", __func__); + if (!access(s[S_PATH_RECORD], F_OK)) + { + FILE * file_read = try_fopen(s[S_PATH_RECORD], "r", __func__); + uint32_t linemax = textfile_width(file_read); + char * line = try_malloc(linemax + 1, __func__); + while (try_fgets(line, linemax + 1, file_read, __func__)) + { + try_fwrite(line, strlen(line), 1, file_tmp, __func__); + } + free(line); + try_fclose(file_read, __func__); + } } - else + if (msg) { - err_line(1, "Unknown command."); - free(msg_copy); - return; + try_fwrite(msg, strlen(msg), 1, file_tmp, __func__); + try_fputc('\n', file_tmp, __func__); } - world.last_update_turn = 0; - free(msg_copy); - if (do_record) + if (force || time(NULL) > save_wait + 15) { + save_wait = time(NULL); save_world(); - record_msg(msg); + atomic_write_finish(file_tmp, s[S_PATH_RECORD], path_tmp); + file_tmp = NULL; } } -extern uint8_t io_loop() +extern uint8_t obey_msg(char * msg, uint8_t obey_state) { - char * f_name = "io_loop()"; - while (1) + if (world.is_verbose) { - server_test(); - char * msg = io_round(); - if (NULL == msg) - { - continue; - } - 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) + { + ret = parse_command_meta(tok0); + if (ret || (obey_state < 2 && parse_command_nonmeta(tok0))) { - exit_trouble(-1 == printf("Input: %s\n", msg), f_name, "printf()"); + if (!ret) + { + 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."); } - if (!strcmp("QUIT", msg)) + else if (world.replay) { - free(msg); - return 1; + ret = 3; } - if (!strcmp("PING", msg)) + else if (!world.replay) { - free(msg); - char * pong = "PONG\n"; - try_fwrite(pong, strlen(pong), 1, world.file_out, f_name); - fflush(world.file_out); - continue; + err_line(1, "Invalid command/argument or bad number of tokens."); } - if (world.replay) + } + free(msg_copy); + return ret; +} + + + +extern uint8_t io_loop(uint8_t obey_state) +{ + while (1) + { + char * msg = io_round(); + server_test(); + if (msg) { + uint8_t ret = obey_msg(msg, obey_state); free(msg); - return 0; + if ( (!world.replay && 2 == ret) + || ( world.replay && 2 <= ret)) + { + return ret; + } } - obey_msg(msg, 1); - free(msg); } }