X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Frun.c;h=bd054022973d94c5f1d4e2a653414f2ef369be9f;hb=d2707c20a501a2c99af20c7e20f7c1a374bfe6aa;hp=952cebb566d317d46bc62df7a1a8a3233d02fd73;hpb=d92f16d5959fc846d3eaf669517eecb3969cda08;p=plomrogue diff --git a/src/server/run.c b/src/server/run.c index 952cebb..bd05402 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -1,98 +1,246 @@ /* src/server/run.c */ +#define _POSIX_C_SOURCE 200809L #include "run.h" #include /* NULL */ #include /* uint8_t, uint16_t, uint32_t */ -#include /* FILE, sprintf(), fflush() */ -#include /* free() */ -#include /* strlen(), strcmp() strncmp(), atoi() */ +#include /* FILE, printf(), fflush() */ +#include /* free(), atoi() */ +#include /* strlen(), strcmp() strncmp(), strdup() */ #include /* access() */ +#include "../common/parse_file.h" /* set_err_line_options(), token_from_line(), + * err_line() + */ #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() */ #include "../common/rexit.h" /* exit_trouble(), exit_err() */ +#include "../common/try_malloc.h" /* try_malloc() */ #include "ai.h" /* ai() */ -#include "cleanup.h" /* unset_cleanup_flag() */ +#include "cleanup.h" /* set_cleanup_flag(), unset_cleanup_flag() */ +#include "field_of_view.h" /* build_fov_map() */ +#include "hardcoded_strings.h" /* s */ #include "init.h" /* remake_world() */ -#include "io.h" /* io_round() */ -#include "thing_actions.h" /* get_thing_action_id_by_name() */ -#include "things.h" /* Thing, get_player() */ -#include "world.h" /* global 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" /* world */ -/* Run the game world and its inhabitants (and their actions) until the player - * avatar is free to receive new commands (or is dead). +/* 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); + +/* 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/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 void turn_over(); +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 "tok0" with one arguments "tok1" to player action. */ +static uint8_t parse_player_command_0arg(char * tok0, char * tok1); -/* If "msg"'s first part matches "command_name", set player's Thing's .command - * to the command's id and its .arg to a numerical value following in the latter - * part of "msg" (if no digits are found, use 0); then finish player's turn and - * turn game over to the NPCs via turn_over(); then return 1. Else, return 0. +/* Parse player command "tok0" with no argument to player action, comment on + * invalidity of non-zero "tok1" (but do not abort in that case). */ -static uint8_t apply_player_command(char * msg, char * command_name); +static uint8_t parse_player_command_1arg(char * tok0, char * tok1); + +/* Parse/apply commadn "tok0" with argument "tok1" and test the line for further + * tokens, commenting on their invalidity (but don't abort on findingthem). + */ +static uint8_t parse_command_1arg(char * tok0, char * tok1); + -/* Compares first line of file at world.path_out 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. +/* 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. */ static void server_test(); +/* Run the game world and its inhabitants (and their actions) until the player + * avatar is free to receive new commands (or is dead). + */ +static void turn_over(); -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) { - 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)) + uint8_t id; + if (parse_val(tok0, tok1, s[S_CMD_CARRIES], '8', (char *) &id)) { - if (NULL == thing) + if (!err_line(id == t->id, "Thing cannot carry itself.")) { - world.turn++; - thing = world.things; + 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; + } } - if (0 < thing->lifepoints) + return 1; + } + return 0; +} + + + +static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t) +{ + char axis = 0; + if (!strcmp(tok0, s[S_CMD_POS_Y])) + { + axis = 'y'; + } + else if (!strcmp(tok0, s[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 (0 == thing->command) + if ('y' == axis) { - if (thing == player) - { - break; - } - ai(thing); + t->pos.y = length; } - thing->progress++; - struct ThingAction * ta = world.thing_actions; - while (ta->id != thing->command) + else if ('x' == axis) { - ta = ta->next; + t->pos.x = length; } - if (thing->progress == ta->effort) + 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) +{ + uint8_t type; + if (parse_val(tok0, tok1, s[S_CMD_TYPE], '8', (char *) &type)) + { + 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; + } + return 1; + } + return 0; +} + + + +static uint8_t parse_thing_command(char * tok0, char * tok1, struct Thing * t) +{ + uint8_t command; + if (parse_val(tok0, tok1, s[S_CMD_COMMAND], '8', (char *) &command)) + { + 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; + } + return 0; +} + + + +static uint8_t parse_do_fov(char * tok0, char * tok1) +{ + if (parse_val(tok0, tok1, s[S_CMD_DO_FOV], '8', (char *) &do_fov)) + { + if (do_fov) + { + struct Thing * ti; + for (ti = world.things; ti; ti = ti->next) { - ta->func(thing); - thing->command = 0; - thing->progress = 0; + ti->fov_map = ti->lifepoints ? build_fov_map(ti) : ti->fov_map; } } - thing = thing->next; + return 1; } + return 0; } -static uint8_t apply_player_command(char * msg, char * command_name) +static uint8_t parse_thing_manipulation(char * tok0, char * tok1) { - if (!strncmp(msg, command_name, strlen(command_name))) + 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 { - struct Thing * player = get_player(); - player->arg = atoi(&(msg[strlen(command_name)])); - player->command = get_thing_action_id_by_name(command_name); + return 0; + } + return 1; +} + + + +static uint8_t parse_player_command_0arg(char * tok0, char * tok1) +{ + struct Thing * player = get_player(); + if (!strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP])) + { + player->command = get_thing_action_id_by_name(tok0); + player->arg = 0; turn_over(); + err_line (NULL != tok1, "No arguments expected, ignoring arguments."); return 1; } return 0; @@ -100,11 +248,58 @@ static uint8_t apply_player_command(char * msg, char * command_name) +static uint8_t parse_player_command_1arg(char * tok0, char * tok1) +{ + struct Thing * player = get_player(); + if ( parse_val(tok0, tok1, s[S_CMD_MOVE], '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; +} + + + +static uint8_t parse_command_1arg(char * tok0, char * tok1) +{ + char * tok2 = token_from_line(NULL); + if ( parse_thing_manipulation(tok0, tok1) + || parse_player_command_1arg(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(); + } + else + { + return 0; + } + char * err = "But one argument expected, ignoring further arguments."; + err_line (NULL != tok2, err); + return 1; +} + + + static void server_test() { char * f_name = "server_test()"; char test[10 + 1 + 10 + 1 + 1]; - FILE * file = try_fopen(world.path_out, "r", f_name); + 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)) @@ -121,42 +316,95 @@ static void server_test() -extern void obey_msg(char * msg, uint8_t do_record) +static void turn_over() { - char * f_name = "obey_msg()"; - if ( apply_player_command(msg, "wait") /* TODO: Check for non-error */ - || apply_player_command(msg, "move") /* return value of a modified */ - || apply_player_command(msg, "pick_up")/*get_thing_action_id_by_name()*/ - || apply_player_command(msg, "drop") /* and if id found, execute on */ - || apply_player_command(msg, "use")); /* it what's in */ - else /* apply_player_command(). */ + 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)) { - char * seed_command = "seed"; - if (!strncmp(msg, seed_command, strlen(seed_command))) + if (NULL == thing) { - remake_world(atoi(&(msg[strlen(seed_command)]))); + world.turn++; + thing = world.things; } + if (0 < thing->lifepoints) + { + if (0 == thing->command) + { + if (thing == player) + { + break; + } + 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; + } + } + thing = thing->next; + } +} + + + +static void record_msg(char * msg) +{ + 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)) + { + 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); } - if (do_record) + 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) +{ + set_err_line_options("Trouble with message: ", msg, 0, 0); + char * msg_copy = strdup(msg); + char * tok0 = token_from_line(msg_copy); + if (NULL != tok0) { - char path_tmp[strlen(world.path_record) + strlen(world.tmp_suffix) + 1]; - sprintf(path_tmp, "%s%s", world.path_record, world.tmp_suffix); - FILE * file_tmp = try_fopen(path_tmp, "w", f_name); - if (!access(world.path_record, F_OK)) + char * tok1 = token_from_line(NULL); + if ( parse_player_command_0arg(tok0, tok1) + || (tok1 && parse_command_1arg(tok0, tok1))) { - FILE * file_read = try_fopen(world.path_record, "r", f_name); - uint32_t linemax = textfile_width(file_read); - char line[linemax + 1]; - while (try_fgets(line, linemax + 1, file_read, f_name)) + world.do_update = 1; + if (do_record) { - try_fwrite(line, strlen(line), 1, file_tmp, f_name); + save_world(); + record_msg(msg); } - try_fclose(file_read, f_name); + free(msg_copy); + return; } - 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, world.path_record, f_name); } + err_line(1, "Unknown command or bad number of tokens."); + free(msg_copy); }