X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fserver%2Frun.c;h=78b158bd10d5dbc3cd0079ae218e8af0c97f475a;hb=8848ee617c7900bcfae8033af3cb290df4cc9efc;hp=1df4b63b6668dbd5076ae3d9fa7ea26b529f00be;hpb=e430e9baabcde0c5ee373928ffb363bb452f6bb7;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 1df4b63..78b158b 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -1,132 +1,372 @@
/* src/server/run.c */
+#define _POSIX_C_SOURCE 200809L
#include "run.h"
#include /* NULL */
#include /* uint8_t, uint16_t, uint32_t */
-#include /* FILE, sprintf() */
-#include /* free() */
-#include /* strlen(), strncmp(), atoi() */
+#include /* FILE, sprintf(), 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_sizes(), try_fputc()
+ * textfile_width(), try_fputc()
*/
-#include "../common/rexit.h" /* exit_trouble() */
+#include "../common/rexit.h" /* exit_trouble(), exit_err() */
#include "ai.h" /* ai() */
+#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 "map_object_actions.h" /* get_moa_id_by_name() */
-#include "map_objects.h" /* struct MapObj, get_player() */
+#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 */
+/* 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 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);
+
+/* 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();
-/* 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.
- */
-static uint8_t apply_player_command(char * msg, char * command_name);
+
+
+/* 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)
+{
+ uint8_t type;
+ if (parse_val(tok0, tok1, 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[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[CMD_DO_FOV], '8', (char *) &do_fov))
+ {
+ if (do_fov)
+ {
+ struct Thing * ti;
+ for (ti = world.things; ti; ti = ti->next)
+ {
+ ti->fov_map = ti->lifepoints ? build_fov_map(ti) : ti->fov_map;
+ }
+ }
+ return 1;
+ }
+ return 0;
+}
+
+
+
+static uint8_t parse_thing_manipulation(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))
+ {
+ 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
+ {
+ return 0;
+ }
+ return 1;
+}
+
+
+
+static uint8_t parse_player_command(char * tok0, char * tok1)
+{
+ 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))
+ {
+ player->command = get_thing_action_id_by_name(tok0);
+ turn_over();
+ }
+ else
+ {
+ return 0;
+ }
+ return 1;
+}
+
+
+
+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);
+ if (strcmp(test, world.server_test))
+ {
+ unset_cleanup_flag(CLEANUP_WORLDSTATE);
+ unset_cleanup_flag(CLEANUP_OUT);
+ unset_cleanup_flag(CLEANUP_IN);
+ char * msg = "Server test string in server output file does not match. "
+ "This indicates that the current server process has been "
+ "superseded by another one.";
+ exit_err(1, msg);
+ }
+}
static void turn_over()
{
- struct MapObj * player = get_player();
- struct MapObj * map_object = player;
+ 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))
{
- if (NULL == map_object)
+ if (NULL == thing)
{
world.turn++;
- map_object = world.map_objs;
+ thing = world.things;
}
- if (0 < map_object->lifepoints)
+ if (0 < thing->lifepoints)
{
- if (0 == map_object->command)
+ if (0 == thing->command)
{
- if (map_object == player)
+ if (thing == player)
{
break;
}
- ai(map_object);
+ ai(thing);
}
- map_object->progress++;
- struct MapObjAct * moa = world.map_obj_acts;
- while (moa->id != map_object->command)
+ thing->progress++;
+ struct ThingAction * ta = world.thing_actions;
+ while (ta->id != thing->command)
{
- moa = moa->next;
+ ta = ta->next;
}
- if (map_object->progress == moa->effort)
+ if (thing->progress == ta->effort)
{
- moa->func(map_object);
- map_object->command = 0;
- map_object->progress = 0;
+ ta->func(thing);
+ thing->command = 0;
+ thing->progress = 0;
}
}
- map_object = map_object->next;
+ thing = thing->next;
}
}
-static uint8_t apply_player_command(char * msg, char * command_name)
+static void record_msg(char * msg)
{
- if (!strncmp(msg, command_name, strlen(command_name)))
+ char * f_name = "record_msg()";
+ char path_tmp[strlen(s[PATH_RECORD]) + strlen(s[PATH_SUFFIX_TMP]) + 1];
+ sprintf(path_tmp, "%s%s", s[PATH_RECORD], s[PATH_SUFFIX_TMP]);
+ FILE * file_tmp = try_fopen(path_tmp, "w", f_name);
+ if (!access(s[PATH_RECORD], F_OK))
{
- struct MapObj * player = get_player();
- player->arg = atoi(&(msg[strlen(command_name)]));
- player->command = get_moa_id_by_name(command_name);
- turn_over();
- return 1;
+ FILE * file_read = try_fopen(s[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))
+ {
+ try_fwrite(line, strlen(line), 1, file_tmp, f_name);
+ }
+ try_fclose(file_read, f_name);
}
- return 0;
+ 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);
}
extern void obey_msg(char * msg, uint8_t do_record)
{
- 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(). */
+ set_err_line_options("Trouble with message: ", msg, 0, 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."))
+ {
+ 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
{
- char * seed_command = "seed";
- if (!strncmp(msg, seed_command, strlen(seed_command)))
- {
- remake_world(atoi(&(msg[strlen(seed_command)])));
- }
+ err_line(1, "Unknown command.");
+ free(msg_copy);
+ return;
}
+ world.last_update_turn = 0;
+ free(msg_copy);
if (do_record)
{
- 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))
- {
- FILE * file_read = try_fopen(world.path_record, "r", f_name);
- uint32_t linemax = textfile_sizes(file_read, NULL);
- char line[linemax + 1];
- while (try_fgets(line, linemax + 1, file_read, f_name))
- {
- try_fwrite(line, strlen(line), 1, file_tmp, f_name);
- }
- 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, world.path_record, f_name);
+ save_world();
+ record_msg(msg);
}
}
@@ -137,6 +377,7 @@ extern uint8_t io_loop()
char * f_name = "io_loop()";
while (1)
{
+ server_test();
char * msg = io_round();
if (NULL == msg)
{
@@ -151,6 +392,14 @@ extern uint8_t io_loop()
free(msg);
return 1;
}
+ if (!strcmp("PING", msg))
+ {
+ free(msg);
+ char * pong = "PONG\n";
+ try_fwrite(pong, strlen(pong), 1, world.file_out, f_name);
+ fflush(world.file_out);
+ continue;
+ }
if (world.replay)
{
free(msg);