X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=8c1297d1da1172a51a802578c5d01c5ce99f016a;hb=c8841380b53dbd999061a8de399e71d5d8272fb0;hp=2b56a9d97a721a729156b93bcf3c51b8c40e7d2c;hpb=778534bf6946fe0fef17e353c55678d248d8d09d;p=plomrogue diff --git a/src/server/run.c b/src/server/run.c index 2b56a9d..8c1297d 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -4,57 +4,45 @@ #include "run.h" #include /* NULL */ #include /* uint8_t, uint16_t, uint32_t */ -#include /* FILE, printf(), sprintf(), fflush() */ -#include /* free(), atoi() */ -#include /* strlen(), strcmp() strncmp(), strdup() */ +#include /* FILE, printf(), fflush() */ +#include /* 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() */ #include "../common/readwrite.h" /* try_fopen(), try_fcose(), try_fwrite(), - * try_fgets(), try_fclose_unlink_rename(), - * 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 "god_commands.h" /* parse_god_command_1arg(),parse_god_command_2arg()*/ #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 "world.h" /* global world */ +#include "things.h" /* Thing, get_thing_action_id_by_name(), get_player() */ +#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); +/* 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 commansd in "tok0"/"tok1" on positioning a thing "t". */ -static uint8_t parse_position(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 in "tok0"/"tok1" oo setting "t"'s thing type. */ -static uint8_t parse_thing_type(char * tok0, char * tok1, struct Thing * t); +/* Parse player command "tok0" with no argument to player action. */ +static uint8_t parse_player_command_0arg(char * tok0); -/* 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); +/* Parse player command "tok0" with one argument "tok1" to player action. */ +static uint8_t parse_player_command_1arg(char * tok0, char * tok1); -/* 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. - */ -static uint8_t parse_do_fov(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 command "tok0" (read further tokens as necessary). */ +static uint8_t parse_command(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 @@ -70,78 +58,12 @@ 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) -{ - uint8_t id; - if (parse_val(tok0, tok1, s[CMD_CARRIES], '8', (char *) &id)) - { - 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; - } - } - return 1; - } - return 0; -} - - - -static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t) -{ - char axis = 0; - if (!strcmp(tok0, s[CMD_POS_Y])) - { - axis = 'y'; - } - else if (!strcmp(tok0, s[CMD_POS_X])) - { - axis = 'x'; - } - if (axis && !parsetest_int(tok1, '8')) - { - uint8_t length = atoi(tok1); - char * err = "Position is outside of map."; - if (!err_line(length >= world.map.length, err)) - { - if ('y' == axis) - { - t->pos.y = length; - } - else if ('x' == axis) - { - t->pos.x = length; - } - free(t->fov_map); - t->fov_map= do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map; - } - return 1; - } - return 0; -} - - - -static uint8_t parse_thing_type(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 type; - if (parse_val(tok0, tok1, s[CMD_TYPE], '8', (char *) &type)) + if (!strcmp(string, comparand)) { - struct ThingType * tt = world.thing_types; - for (; NULL != tt && type != tt->id; tt = tt->next); - if (!err_line(!tt, "Thing type does not exist.")) - { - t->type = type; - } + * c_to_set = value; return 1; } return 0; @@ -149,40 +71,36 @@ static uint8_t parse_thing_type(char * tok0, char * tok1, struct Thing * t) -static uint8_t parse_thing_command(char * tok0, char * tok1, struct Thing * t) +static uint8_t player_commands_allowed() { - uint8_t command; - if (parse_val(tok0, tok1, s[CMD_COMMAND], '8', (char *) &command)) + if (!world.exists) { - if (!command) - { - 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.")) - { - t->command = command; - } - return 1; + err_line(1, "No world exists in which to run player commands."); + return 0; } - return 0; + return 1; } -static uint8_t parse_do_fov(char * tok0, char * tok1) +static uint8_t parse_player_command_0arg(char * tok0) { - if (parse_val(tok0, tok1, s[CMD_DO_FOV], '8', (char *) &do_fov)) + struct Thing * player = get_player(); + if ( !strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP]) + || !strcmp(tok0, s[S_CMD_AI])) { - if (do_fov) + if (player_commands_allowed()) { - struct Thing * ti; - for (ti = world.things; ti; ti = ti->next) + if (!strcmp(tok0, s[S_CMD_AI])) + { + ai(player); + } + else { - ti->fov_map = ti->lifepoints ? build_fov_map(ti) : ti->fov_map; + player->command = get_thing_action_id_by_name(tok0); + player->arg = 0; } + turn_over(); } return 1; } @@ -191,27 +109,31 @@ static uint8_t parse_do_fov(char * tok0, char * tok1) -static uint8_t parse_thing_manipulation(char * tok0, char * tok1) +static uint8_t parse_player_command_1arg(char * tok0, char * tok1) { - 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[CMD_ARGUMENT], '8', (char *)&t->arg) - || parse_val(tok0, tok1, s[CMD_PROGRESS],'8',(char *)&t->progress) - || parse_val(tok0, tok1, s[CMD_LIFEPOINTS],'8', - (char *) &t->lifepoints) - || parse_position(tok0, tok1, t) - || parse_carry(tok0, tok1, t))); - else if (parse_val(tok0, tok1, s[CMD_THING], '8', (char *) &id)) + 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()) { - t = get_thing(world.things, id, 1); - if (!t) + player->command = get_thing_action_id_by_name(tok0); + turn_over(); + } + else if (!strcmp(tok0, s[S_CMD_MOVE]) && player_commands_allowed()) + { + 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 = add_thing(id, 0, 0); - set_cleanup_flag(CLEANUP_THINGS); - t->fov_map= do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map; + return 0; } + player->arg = dir; + player->command = get_thing_action_id_by_name(tok0); + turn_over(); } else { @@ -222,34 +144,40 @@ static uint8_t parse_thing_manipulation(char * tok0, char * tok1) -static uint8_t parse_player_command(char * tok0, char * tok1) +static uint8_t parse_command(char * tok0) { - struct Thing * player = get_player(); - if ( parse_val(tok0, tok1, s[CMD_WAIT], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[CMD_MOVE], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[CMD_PICKUP], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[CMD_DROP], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[CMD_USE], '8', (char *) &player->arg)) + if (parse_player_command_0arg(tok0)) { - player->command = get_thing_action_id_by_name(tok0); - turn_over(); + return 1; } else { - return 0; + char * tok1 = token_from_line(NULL); + if (tok1 && ( parse_player_command_1arg(tok0, tok1) + || parse_god_command_1arg(tok0, tok1))) + { + return 1; + } + else + { + char * tok2 = token_from_line(NULL); + if (tok2 && parse_god_command_2arg(tok0, tok1, tok2)) + { + return 1; + } + } } - return 1; + return 0; } static void server_test() { - char * f_name = "server_test()"; char test[10 + 1 + 10 + 1 + 1]; - FILE * file = try_fopen(s[PATH_OUT], "r", f_name); - try_fgets(test, 10 + 10 + 1 + 1, file, f_name); - try_fclose(file, f_name); + 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)) { unset_cleanup_flag(CLEANUP_WORLDSTATE); @@ -288,11 +216,7 @@ static void turn_over() ai(thing); } thing->progress++; - struct ThingAction * ta = world.thing_actions; - while (ta->id != thing->command) - { - ta = ta->next; - } + struct ThingAction * ta = get_thing_action(thing->command); if (thing->progress == ta->effort) { ta->func(thing); @@ -306,90 +230,91 @@ static void turn_over() -static void record_msg(char * msg) +extern void record(char * msg, uint8_t force) { - char * f_name = "record_msg()"; - uint16_t size = strlen(s[PATH_RECORD]) + strlen(s[PATH_SUFFIX_TMP]) + 1; - char * path_tmp = try_malloc(size, f_name); - int test = sprintf(path_tmp, "%s%s", s[PATH_RECORD], s[PATH_SUFFIX_TMP]); - exit_trouble(test < 0, f_name, "sprintf()"); - FILE * file_tmp = try_fopen(path_tmp, "w", f_name); - if (!access(s[PATH_RECORD], F_OK)) + static FILE * file_tmp = NULL; + static time_t save_wait = 0; + static char * path_tmp; + if (!file_tmp) { - FILE * file_read = try_fopen(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)) + 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)) { - try_fwrite(line, strlen(line), 1, file_tmp, f_name); + 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__); } - free(line); - try_fclose(file_read, f_name); } - try_fwrite(msg, strlen(msg), 1, file_tmp, f_name); - try_fputc('\n', file_tmp, f_name); - try_fclose_unlink_rename(file_tmp, path_tmp, s[PATH_RECORD], f_name); - free(path_tmp); + if (msg) + { + try_fwrite(msg, strlen(msg), 1, file_tmp, __func__); + try_fputc('\n', file_tmp, __func__); + } + if (force || time(NULL) > save_wait + 15) + { + save_wait = time(NULL); + save_world(); + atomic_write_finish(file_tmp, s[S_PATH_RECORD], path_tmp); + file_tmp = NULL; + } } -extern void obey_msg(char * msg, uint8_t do_record) +extern void obey_msg(char * msg, uint8_t do_record, uint8_t do_verbose) { - set_err_line_options("Trouble with message: ", msg, 0, 0); + if (world.is_verbose && do_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); - char * tok1 = token_from_line(NULL); - char * tok2 = token_from_line(NULL); - if (err_line(!(tok0 && tok1) || tok2, "Bad number of tokens.")) + if (NULL != tok0) { - return; - } - if ( parse_thing_manipulation(tok0, tok1) - || parse_player_command(tok0, tok1) - || parse_val(tok0, tok1, s[CMD_SEED_RAND], 'U', (char *) &world.seed) - || parse_val(tok0, tok1, s[CMD_TURN], 'u', (char *) &world.turn) - || parse_do_fov(tok0, tok1)); - else if (parse_val(tok0, tok1, s[CMD_SEED_MAP],'U',(char *)&world.seed_map)) - { - remake_map(); - } - else if (parse_val(tok0, tok1, s[CMD_MAKE_WORLD],'U', (char *) &world.seed)) - { - remake_world(); - } - else - { - err_line(1, "Unknown command."); - free(msg_copy); - return; + if (parse_command(tok0)) + { + if (world.exists) + { + world.do_update = 1; + } + if (do_record) + { + record(msg, 0); + } + char * tokplus = token_from_line(NULL); + err_line(NULL != tokplus, "Too many arguments, ignoring overflow."); + free(msg_copy); + return; + } } - world.last_update_turn = 0; + err_line(1, "Unknown command/argument or bad number of tokens."); free(msg_copy); - if (do_record) - { - save_world(); - record_msg(msg); - } } extern uint8_t io_loop() { - char * f_name = "io_loop()"; while (1) { - server_test(); char * msg = io_round(); + server_test(); if (NULL == msg) { continue; } if (world.is_verbose) { - exit_trouble(-1 == printf("Input: %s\n", msg), f_name, "printf()"); + exit_trouble(-1 == printf("Input: %s\n", msg), __func__, "printf"); } if (!strcmp("QUIT", msg)) { @@ -400,7 +325,7 @@ extern uint8_t io_loop() { free(msg); char * pong = "PONG\n"; - try_fwrite(pong, strlen(pong), 1, world.file_out, f_name); + try_fwrite(pong, strlen(pong), 1, world.file_out, __func__); fflush(world.file_out); continue; } @@ -409,7 +334,7 @@ extern uint8_t io_loop() free(msg); return 0; } - obey_msg(msg, 1); + obey_msg(msg, 1, 0); free(msg); } }