*/
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);
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] = 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)
{
- int16_t i;
+ uint16_t i;
for (i = 0; -1 < whitelist[i]; i++)
{
if ((int16_t) id == whitelist[i])
{
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++;
thing = world.things;
free(whitelist);
- whitelist = build_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)
-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))
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)
&& 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;
+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;