X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=808be55398a3a03e7f1d69d67c104d3850ebaffd;hb=a9377a5125c28779f812f859564d4f4d0b744e89;hp=70a663c1761e59d0a4825df55b07b26eada32fb7;hpb=1cb57a35a3b3cc4ec8870531ca254a655c0bdda2;p=plomrogue diff --git a/src/server/run.c b/src/server/run.c index 70a663c..808be55 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -1,27 +1,36 @@ -/* 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() */ #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() */ #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" /* unset_cleanup_flag() */ -#include "god_commands.h" /* parse_god_command_1arg() */ +#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() */ +#include "things.h" /* Thing, ThingType, get_thing_action_id_by_name(), + * get_player(), try_thing_proliferation() + */ #include "world.h" /* world */ @@ -33,19 +42,14 @@ 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, comment on - * invalidity of non-zero "tok1" (but do not abort in that case). - */ -static uint8_t parse_player_command_0arg(char * tok0, char * tok1); +/* Parse player command "tok0" with no argument to player action. */ +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" with argument "tok1" and test the line for further - * tokens, commenting on their invalidity (but don't abort on finding them). - */ -static uint8_t parse_command_1arg(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 @@ -54,11 +58,24 @@ static uint8_t parse_command_1arg(char * tok0, char * tok1); */ 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(); +/* 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); @@ -79,25 +96,31 @@ static uint8_t player_commands_allowed() { if (!world.exists) { - err_line(1, "No world exists in which to run player commands."); - return 0; + return !err_line(1, "No world exists in which to run player commands."); } return 1; } -static uint8_t parse_player_command_0arg(char * tok0, char * tok1) +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])) + if ( !strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP]) + || !strcmp(tok0, s[S_CMD_AI])) { if (player_commands_allowed()) { - player->command = get_thing_action_id_by_name(tok0); - player->arg = 0; + if (!strcmp(tok0, s[S_CMD_AI])) + { + ai(player); + } + else + { + player->command = get_thing_action_id_by_name(tok0); + player->arg = 0; + } turn_over(); - err_line (NULL != tok1, "No arguments expected, ignoring them."); } return 1; } @@ -141,18 +164,38 @@ static uint8_t parse_player_command_1arg(char * tok0, char * tok1) -static uint8_t parse_command_1arg(char * tok0, char * tok1) +static uint8_t parse_command(char * tok0) { - char * tok2 = token_from_line(NULL); - if ( parse_player_command_1arg(tok0, tok1) - || parse_god_command_1arg(tok0, tok1)); + if (parse_player_command_0arg(tok0)) + { + 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; + } + else + { + char * tok3 = token_from_line(NULL); + if (tok2 && parse_god_command_3arg(tok0, tok1, tok2, tok3)) + { + return 1; + } + } + } } - char * err = "But one argument expected, ignoring further arguments."; - err_line (NULL != tok2, err); - return 1; + return 0; } @@ -177,64 +220,160 @@ static void server_test() +static int16_t * build_whitelist() +{ + 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 uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist) +{ + int16_t i; + for (i = 0; -1 < whitelist[i]; i++) + { + if ((int16_t) id == whitelist[i]) + { + return 1; + } + } + return 0; +} + + + 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)) - { - if (NULL == thing) + { /* TODO: check meaning and refactorability of 2nd condition */ + if (!thing) { world.turn++; thing = world.things; + free(whitelist); + whitelist = build_whitelist(); } - if (0 < thing->lifepoints) + if (thing_in_whitelist(thing->id, whitelist)) { - if (0 == thing->command) + if (0 < thing->lifepoints) { - if (thing == player) + if (0 == thing->command) { - break; + if (thing == player) + { + break; + } + ai(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; } - ai(thing); } - thing->progress++; + try_thing_proliferation(thing); + } + thing = thing->next; + } + free(whitelist); +} + + + +static void answer_query(char * answer) +{ + try_fwrite(answer, strlen(answer), 1, world.file_out, __func__); + fflush(world.file_out); +} + - struct ThingAction * ta = get_thing_action(thing->command); - if (thing->progress == ta->effort) + +static uint8_t meta_commands(char * msg) +{ + if (!strcmp("QUIT", msg)) + { + free(msg); + return 2; + } + if (!strcmp("PING", msg)) + { + free(msg); + answer_query("PONG\n"); + return 1; + } + 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) { - ta->func(thing); - thing->command = 0; - thing->progress = 0; + struct ThingType * tt = get_thing_type(t->type); + answer_query(tt->name); + answer_query("\n"); } } - thing = thing->next; + answer_query("THINGS_BELOW_PLAYER END\n"); + return 1; } + return 0; } -static void record_msg(char * msg) +extern void record(char * msg, uint8_t force) { - char * path_tmp; - FILE * file_tmp = atomic_write_start(s[S_PATH_RECORD], &path_tmp); - if (!access(s[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[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__)) + 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, __func__); + 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, __func__); } - try_fwrite(msg, strlen(msg), 1, file_tmp, __func__); - try_fputc('\n', file_tmp, __func__); - atomic_write_finish(file_tmp, s[S_PATH_RECORD], 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; + } } @@ -247,17 +386,11 @@ extern void obey_msg(char * msg, uint8_t do_record, uint8_t do_verbose) } set_err_line_options("Trouble with message: ", msg, 0); char * msg_copy = strdup(msg); - if (msg[0] == 'm') - { - int a = 5; - a = a; - } char * tok0 = token_from_line(msg_copy); - if (NULL != tok0) + if (tok0) { - char * tok1 = token_from_line(NULL); - if ( parse_player_command_0arg(tok0, tok1) - || (tok1 && parse_command_1arg(tok0, tok1))) + + if (parse_command(tok0)) { if (world.exists) { @@ -265,9 +398,10 @@ extern void obey_msg(char * msg, uint8_t do_record, uint8_t do_verbose) } if (do_record) { - save_world(); - record_msg(msg); + record(msg, 0); } + char * tokplus = token_from_line(NULL); + err_line(!(!tokplus), "Too many arguments, ignoring overflow."); free(msg_copy); return; } @@ -282,9 +416,9 @@ extern uint8_t io_loop() { while (1) { - server_test(); char * msg = io_round(); - if (NULL == msg) + server_test(); + if (!msg) { continue; } @@ -292,17 +426,13 @@ extern uint8_t io_loop() { exit_trouble(-1 == printf("Input: %s\n", msg), __func__, "printf"); } - if (!strcmp("QUIT", msg)) + uint8_t test = meta_commands(msg); + if (test) { - 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); + if (2 == test) + { + return 1; + } continue; } if (world.replay)