X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=212a37e16d62d6adb9a957b0cb11aa1136769e41;hb=3fb2cb493ae564f8b14ddb4143b6c1f5bf16f16a;hp=786b280adb050a64b47edc19e1cecdad46ad55bb;hpb=491e8bc8e7a9b1d312256817c0b8be7e05b127be;p=plomrogue diff --git a/src/server/run.c b/src/server/run.c index 786b280..212a37e 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -1,16 +1,22 @@ -/* 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 /* 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(), @@ -20,10 +26,14 @@ #include "../common/try_malloc.h" /* try_malloc() */ #include "ai.h" /* ai() */ #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 "io.h" /* io_round(), save_world() */ -#include "things.h" /* Thing, get_thing_action_id_by_name(), get_player() */ +#include "thing_actions.h" /* hunger() */ +#include "things.h" /* Thing, ThingType, ThingInMemory, get_player(), + * get_thing_action_id_by_name(), try_thing_proliferation() + */ #include "world.h" /* world */ @@ -35,24 +45,34 @@ 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(); +/* 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(); @@ -75,8 +95,7 @@ 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; } @@ -144,7 +163,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)) { @@ -180,6 +199,66 @@ 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 * 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 + { + 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 0; +} + + + static void server_test() { char test[10 + 1 + 10 + 1 + 1]; @@ -200,40 +279,88 @@ 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) +{ + uint16_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; - while ( 0 < player->lifepoints - || (0 == player->lifepoints && start_turn == world.turn)) + int16_t * whitelist = build_whitelist(); + while (0 < player->lifepoints) { 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 = get_thing_action(thing->command); - if (thing->progress == ta->effort) - { - ta->func(thing); - thing->command = 0; - thing->progress = 0; + 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); +} + + + +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); + } } @@ -276,73 +403,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)) - { - free(msg); - return 1; - } - if (!strcmp("PING", msg)) + if (msg) { + uint8_t ret = obey_msg(msg, obey_state); 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); } }