X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=55376313e99a347d596b43e83012916deac958c6;hb=d4ae3915f817fa25f938c5ab47cea2823ba5aaa9;hp=708bd961ba89dd62847aa35f0f5711c5ef010319;hpb=ff1ad8d5cfa86b38cc1436c6c9cc4135fb0a0f66;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 708bd96..5537631 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -71,9 +71,6 @@ static uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist);
*/
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);
@@ -236,7 +233,7 @@ static int16_t * build_whitelist()
static uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist)
{
- int16_t i;
+ uint16_t i;
for (i = 0; -1 < whitelist[i]; i++)
{
if ((int16_t) id == whitelist[i])
@@ -253,11 +250,9 @@ 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))
- { /* TODO: check meaning and refactorability of 2nd condition */
+ while (0 < player->lifepoints)
+ {
if (!thing)
{
world.turn++;
@@ -295,14 +290,6 @@ static void turn_over()
-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))
@@ -313,13 +300,13 @@ static uint8_t meta_commands(char * msg)
if (!strcmp("PING", msg))
{
free(msg);
- answer_query("PONG\n");
+ send_to_outfile("PONG\n", 1);
return 1;
}
if (!strcmp("STACK", msg))
{
free(msg);
- answer_query("THINGS_BELOW_PLAYER START\n");
+ send_to_outfile("THINGS_BELOW_PLAYER START\n", 1);
struct Thing * player = get_player();
struct Thing * t;
for (t = world.things; t; t = t->next)
@@ -328,11 +315,11 @@ static uint8_t meta_commands(char * msg)
&& t != player)
{
struct ThingType * tt = get_thing_type(t->type);
- answer_query(tt->name);
- answer_query("\n");
+ send_to_outfile(tt->name, 0);
+ send_to_outfile("\n", 1);
}
}
- answer_query("THINGS_BELOW_PLAYER END\n");
+ send_to_outfile("THINGS_BELOW_PLAYER END\n", 1);
return 1;
}
return 0;
@@ -340,6 +327,17 @@ static uint8_t meta_commands(char * msg)
+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);
+ }
+}
+
+
+
extern void record(char * msg, uint8_t force)
{
static FILE * file_tmp = NULL;