X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Frun.c;h=4f93669066464c3bc5b6ea466437c98e9b5b9586;hb=4e4313a0162999f961db391a2dcf943128040e56;hp=786b280adb050a64b47edc19e1cecdad46ad55bb;hpb=491e8bc8e7a9b1d312256817c0b8be7e05b127be;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 786b280..4f93669 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -1,9 +1,14 @@
-/* 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() */
@@ -23,7 +28,9 @@
#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 */
@@ -51,11 +58,25 @@ static uint8_t parse_command(char * tok0);
*/
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);
+
static uint8_t set_char_by_string_comparison(char * string, char * comparand,
@@ -75,8 +96,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;
}
@@ -200,40 +220,120 @@ 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;
+ 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++;
- struct ThingAction * ta = get_thing_action(thing->command);
- if (thing->progress == ta->effort)
+ 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);
+}
+
+
+
+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;
}
@@ -324,17 +424,13 @@ extern uint8_t io_loop()
{
exit_trouble(-1 == printf("Input: %s\n", msg), __func__, "printf");
}
- if (!strcmp("QUIT", msg))
- {
- free(msg);
- return 1;
- }
- if (!strcmp("PING", msg))
+ uint8_t test = meta_commands(msg);
+ if (test)
{
- 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)