X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Frun.c;h=11735d02c8c8ea93c19c025f5dfe3bb5d4827b75;hb=ad665ff6f22943c1f1982d13e1dbea1cedc97a65;hp=414549227f963db1d3c21135cdfe51891cfb24de;hpb=6b1d36c9e673fd8f8595119080dca63a39ba483b;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 4145492..11735d0 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -1,100 +1,259 @@
-/* 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 /* strdup() */
#include "run.h"
#include /* NULL */
-#include /* uint8_t, uint16_t, uint32_t */
-#include /* FILE, sprintf(), fflush() */
-#include /* free() */
-#include /* strlen(), strcmp() strncmp(), atoi() */
+#include /* uint8_t, uint16_t, uint32_t, int16_t */
+#include /* FILE, printf(), fflush() */
+#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(),
+ * parestest_int()
+ */
#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" /* unset_cleanup_flag() */
-#include "init.h" /* remake_world() */
-#include "io.h" /* io_round() */
-#include "map_object_actions.h" /* get_moa_id_by_name() */
-#include "map_objects.h" /* struct MapObj, get_player() */
-#include "world.h" /* global world */
+#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 "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" /* world */
-/* Run the game world and its inhabitants (and their actions) until the player
- * avatar is free to receive new commands (or is dead).
+/* 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);
+
+/* Return 1 on world.exists, else 0 and err_line() appropriate error message. */
+static uint8_t player_commands_allowed();
+
+/* Parse player commands "tok0" with optional argument "tok1" to player action.
+ * Return 1 on success, 0 on failure.
*/
-static void turn_over();
+static uint8_t parse_player_command_0arg(char * tok0);
+static uint8_t parse_player_command_1arg(char * tok0, char * tok1);
-/* If "msg"'s first part matches "command_name", set player's MapObj'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/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 apply_player_command(char * msg, char * command_name);
+static uint8_t parse_command_nonmeta(char * tok0);
+static uint8_t parse_command_meta(char * tok0);
-/* 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.
+/* 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);
-static void turn_over()
+/* Run the game world and its inhabitants (and their actions) until the player
+ * 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();
+
+
+
+static uint8_t set_char_by_string_comparison(char * string, char * comparand,
+ char * c_to_set, char value)
{
- struct MapObj * player = get_player();
- struct MapObj * map_object = player;
- uint16_t start_turn = world.turn;
- while ( 0 < player->lifepoints
- || (0 == player->lifepoints && start_turn == world.turn))
+ if (!strcmp(string, comparand))
{
- if (NULL == map_object)
- {
- world.turn++;
- map_object = world.map_objs;
- }
- if (0 < map_object->lifepoints)
+ * c_to_set = value;
+ return 1;
+ }
+ return 0;
+}
+
+
+
+static uint8_t player_commands_allowed()
+{
+ if (!world.exists)
+ {
+ return !err_line(1, "No world exists in which to run player commands.");
+ }
+ 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]))
+ {
+ if (player_commands_allowed())
{
- if (0 == map_object->command)
+ if (!strcmp(tok0, s[S_CMD_AI]))
{
- if (map_object == player)
- {
- break;
- }
- ai(map_object);
+ ai(player);
+ }
+ else
+ {
+ player->command = get_thing_action_id_by_name(tok0);
+ player->arg = 0;
}
- map_object->progress++;
- struct MapObjAct * moa = world.map_obj_acts;
- while (moa->id != map_object->command)
+ turn_over();
+ }
+ return 1;
+ }
+ return 0;
+}
+
+
+
+static uint8_t parse_player_command_1arg(char * tok0, char * tok1)
+{
+ 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())
+ {
+ 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')))
+ {
+ return 0;
+ }
+ player->arg = dir;
+ player->command = get_thing_action_id_by_name(tok0);
+ turn_over();
+ }
+ else
+ {
+ return 0;
+ }
+ return 1;
+}
+
+
+
+static uint8_t parse_command_nonmeta(char * tok0)
+{
+ if (parse_player_command_0arg(tok0))
+ {
+ return 1;
+ }
+ else
+ {
+ 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))
{
- moa = moa->next;
+ return 1;
}
- if (map_object->progress == moa->effort)
+ else
{
- moa->func(map_object);
- map_object->command = 0;
- map_object->progress = 0;
+ char * tok3 = token_from_line(NULL);
+ if (tok2 && parse_god_command_3arg(tok0, tok1, tok2, tok3))
+ {
+ return 1;
+ }
}
}
- map_object = map_object->next;
}
+ return 0;
}
-static uint8_t apply_player_command(char * msg, char * command_name)
+static uint8_t parse_command_meta(char * tok0)
{
- if (!strncmp(msg, command_name, strlen(command_name)))
+ if (!strcmp("QUIT", tok0))
{
- struct MapObj * player = get_player();
- player->arg = atoi(&(msg[strlen(command_name)]));
- player->command = get_moa_id_by_name(command_name);
- turn_over();
+ 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;
}
@@ -102,11 +261,10 @@ static uint8_t apply_player_command(char * msg, char * command_name)
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);
- 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);
@@ -121,80 +279,190 @@ static void server_test()
-extern void obey_msg(char * msg, uint8_t do_record)
+static int16_t * build_whitelist()
{
- 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_moa_id_by_name(); if id */
- || apply_player_command(msg, "drop") /* found, execute on it what's */
- || apply_player_command(msg, "use")); /* in apply_player_command(). */
- else
+ 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++)
{
- char * seed_command = "seed";
- if (!strncmp(msg, seed_command, strlen(seed_command)))
+ if ((int16_t) id == whitelist[i])
{
- remake_world(atoi(&(msg[strlen(seed_command)])));
+ return 1;
}
}
- if (do_record)
+ return 0;
+}
+
+
+
+static void turn_over()
+{
+ struct Thing * player = get_player();
+ struct Thing * thing = player;
+ int16_t * whitelist = build_whitelist();
+ while (0 < player->lifepoints)
{
- 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))
+ if (!thing)
{
- 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.turn++;
+ thing = world.things;
+ 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->lifepoints)
{
- try_fwrite(line, strlen(line), 1, file_tmp, f_name);
+ if (0 == thing->command)
+ {
+ update_map_memory(thing);
+ if (thing == player)
+ {
+ break;
+ }
+ ai(thing);
+ }
+ 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_fclose(file_read, f_name);
+ try_thing_proliferation(thing);
}
- 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);
+ thing = thing->next;
}
+ free(whitelist);
}
-extern uint8_t io_loop()
+extern void send_to_outfile(char * answer, uint8_t flush)
{
- char * f_name = "io_loop()";
- while (1)
+ try_fwrite(answer, strlen(answer), 1, world.file_out, __func__);
+ if (flush)
{
- server_test();
- char * msg = io_round();
- if (NULL == msg)
+ fflush(world.file_out);
+ }
+}
+
+
+
+extern void record(char * msg, uint8_t force)
+{
+ static FILE * file_tmp = NULL;
+ static time_t save_wait = 0;
+ static char * path_tmp;
+ if (!file_tmp)
+ {
+ 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))
{
- continue;
+ 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__);
}
- if (world.is_verbose)
+ }
+ 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 uint8_t obey_msg(char * msg, uint8_t obey_state)
+{
+ 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);
}
}